@@ -, +, @@
street type
- Apply patch
- Verify that the alternate address information displays follwing the
setting in syspref AddressFormat and contains street type and
street number (as appropriate)
---
.../en/includes/member-display-alt-address-style-de.inc | 16 ++++++++++++++++
.../en/includes/member-display-alt-address-style-us.inc | 16 ++++++++++++++++
.../intranet-tmpl/prog/en/modules/members/moremember.tt | 14 ++++++++------
3 files changed, 40 insertions(+), 6 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc
@@ -0,0 +1,16 @@
+[% IF ( B_address or B_address2 ) %]
+ [% IF ( B_address ) %]
+ [% SET roadtype_desc = '' %]
+ [% IF B_streettype %]
+ [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
+ [% END %]
+
[% B_address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF B_streetnumber %] [% B_streetnumber %][% END %]
+ [% END %]
+ [% IF ( B_address2 ) %]
+ [% B_address2 %]
+ [% END %]
+[% END %]
+[% IF ( B_city ) %]
+ [%IF ( B_zipcode ) %][% B_zipcode %] [% END %][% B_city %][% IF ( B_state ) %][% B_state %][% END %]
+ [% IF ( B_country ) %]
[% B_country %][% END %]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc
@@ -0,0 +1,16 @@
+[% IF ( B_address or B_address2 ) %]
+ [% IF ( B_address ) %]
+ [% SET roadtype_desc = '' %]
+ [% IF B_streettype %]
+ [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
+ [% END %]
+ [% if (B_streetnumber) %][% B_streetnumber %][% end %] [% IF roadtype_desc %][% roadtype_desc %] [% END %][% B_address %][% end %]
+ [% END %]
+ [% IF ( B_address2 ) %]
+ [% B_address2 %]
+ [% END %]
+[% END %]
+[% IF ( B_city ) %]
+ [% B_city %][% IF ( B_state ) %], [% B_state %][% END %]
+ [% B_zipcode %][% IF ( B_country ) %], [% B_country %][% END %]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -414,12 +414,14 @@ function validate1(date) {
[% UNLESS ( I ) %]
Alternate address
-
- Address: [% B_address %]
- - Address 2: [% B_address2 %]
- - City: [% B_city %]
- [% IF ( B_state ) %]- State: [% B_state %]
[% END %]
- - ZIP/Postal code: [% B_zipcode %]
- [% IF ( B_country ) %]- Country: [% B_country %]
[% END %]
+
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+ [% ELSE %]
+ [% INCLUDE 'member-display-alt-address-style-us.inc' %]
+ [% END %]
+
+
[% IF ( B_phone ) %]- Phone: [% B_phone %]
[% END %]
[% IF ( B_email ) %]- Email: [% B_email %]
[% END %]
[% IF ( contactnote ) %]- Contact note: [% contactnote %]
[% END %]
--