4ed61b56f5
This patch fixes the display of alternative address (streetnumber, streettype and address on same line, see comment #22, and it adds missing class patronaddress1 to main address display. To test: - Create / edit a customer to have streetnumber, streettype and address in both main address and alternate address - Switch syspref addressformat ot French style - Verify that both main address and alternate address display as expected on patron's detail page (street number, street type and address on same line) Signed-off-by: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
21 lines
787 B
HTML
21 lines
787 B
HTML
[% IF ( B_address or B_address2 ) %]
|
|
[% IF ( B_address ) %]
|
|
[% SET roadtype_desc = '' %]
|
|
[% IF B_streettype %]
|
|
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
|
|
[% END %]
|
|
<li class="patronaddress1">[% IF B_streetnumber %][% B_streetnumber %][% END %]
|
|
[%IF roadtype_desc %][% roadtype_desc %] [% END %]
|
|
[% B_address %]
|
|
</li>
|
|
[% END %]
|
|
[% IF ( B_address2 ) %]
|
|
<li class="patronaddress2">[% B_address2 %]</li>
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( B_city ) %]
|
|
<li class="patroncity">[%IF ( B_zipcode ) %][% B_zipcode %] [% END %]
|
|
[% B_city %]
|
|
[% IF ( B_state ) %]</br>[% B_state %][% END %]
|
|
[% IF ( B_country ) %]<br />[% B_country %][% END %]</li>
|
|
[% END %]
|