Jonathan Druart
07f85e7f88
C4::Members::getidcity and C4::Members::GetCities simply retrieved cities info from the cities table. The job done in members/memberentry.pl looked really weird and complicated. Either I have missed something, or this patch can simplify it. The expected behavior is: 1. Create a new patron => No city selected 2. Edit an existing patron => The borrowers.city value is selected 3. Add a guarantee => The borrowers.city of the guarantor is selected 4. Edit a guarantee => The borrowers.city of the guarantee is selected Test plan: Confirm that the expected behaviors are the ones before and after this patch. Signed-off-by: Natasha <tasham_8@hotmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
125 lines
4.4 KiB
HTML
125 lines
4.4 KiB
HTML
<fieldset class="rows" id="memberentry_mainaddress">
|
|
<legend id="main_address_lgd">Main address</legend><ol>
|
|
[% UNLESS nostreettype %]
|
|
[% IF roadtypes %]
|
|
<li>
|
|
[% IF ( mandatorystreettype ) %]
|
|
<label for="streettype" class="required">
|
|
[% ELSE %]
|
|
<label for="streettype">
|
|
[% END %]
|
|
Street type: </label>
|
|
<select name="streettype">
|
|
<option value=""></option>
|
|
[% FOR roadtype IN roadtypes %]
|
|
[% IF roadtype.selected %]
|
|
<option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
|
|
[% ELSE %]
|
|
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
[% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
[% UNLESS noaddress %]
|
|
<li>
|
|
[% IF ( mandatoryaddress ) %]
|
|
<label for="address" class="required">
|
|
[% ELSE %]
|
|
<label for="address">
|
|
[% END %]
|
|
Address: </label>
|
|
<input type="text" id="address" name="address" size="35" value="[% address %]" />
|
|
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nostreetnumber %]
|
|
<li>
|
|
[% IF ( mandatorystreetnumber ) %]
|
|
<label for="streetnumber" class="required">
|
|
[% ELSE %]
|
|
<label for="streetnumber">
|
|
[% END %]
|
|
Street number: </label>
|
|
<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
|
|
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS noaddress2 %]
|
|
<li>
|
|
[% IF ( mandatoryaddress2 ) %]
|
|
<label for="address2" class="required">
|
|
[% ELSE %]
|
|
<label for="address2">
|
|
[% END %]
|
|
Address 2: </label>
|
|
<input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
|
|
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nozipcode %]
|
|
<li>
|
|
[% IF ( mandatoryzipcode ) %]
|
|
<label for="zipcode" class="required">
|
|
[% ELSE %]
|
|
<label for="zipcode">
|
|
[% END %]
|
|
ZIP/Postal code: </label>
|
|
<input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
|
|
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nocity %]
|
|
<li>
|
|
[% IF ( mandatorycity ) %]
|
|
<label for="city" class="required">
|
|
[% ELSE %]
|
|
<label for="city">
|
|
[% END %]
|
|
City: </label>
|
|
<input type="text" id="city" name="city" size="20" value="[% city %]" />
|
|
[% IF cities.count %]or choose
|
|
<select id="select_city" name="select_city">
|
|
<option value="|||"></option>
|
|
[% FOREACH c IN cities %]
|
|
[% IF c.city_name == city %]
|
|
<option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
|
|
[% ELSE %]
|
|
<option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
|
|
[% END %]
|
|
[% c.city_name %] [% c.city_state %] [% c.city_zipcode %]
|
|
</option>
|
|
[% END %]
|
|
</select>
|
|
[% END %]
|
|
[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nostate %]
|
|
<li>
|
|
[% IF ( mandatorystate ) %]
|
|
<label for="state" class="required">
|
|
[% ELSE %]
|
|
<label for="state">
|
|
[% END %]
|
|
State: </label>
|
|
<input type="text" name="state" id="state" size="20" value="[% state %]" />
|
|
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nocountry %]
|
|
<li>
|
|
[% IF ( mandatorycountry ) %]
|
|
<label for="country" class="required">
|
|
[% ELSE %]
|
|
<label for="country">
|
|
[% END %]
|
|
Country: </label>
|
|
<input type="text" name="country" id="country" size="20" value="[% country %]" />
|
|
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
</fieldset>
|