@@ -, +, @@
- Create a patron with all the address, contact and alternate info filled
- Edit them and save
- Look at the patron's info (top left) in the patron module, and the
- Play with the different values of AddressFormat
---
.../en/includes/member-alt-address-style-de.inc | 162 --------------
.../en/includes/member-alt-address-style-fr.inc | 162 --------------
.../en/includes/member-alt-address-style-us.inc | 160 --------------
.../prog/en/includes/member-alt-address-style.inc | 244 +++++++++++++++++++++
.../prog/en/modules/members/memberentrygen.tt | 7 +-
5 files changed, 246 insertions(+), 489 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
@@ -1,162 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc
@@ -1,162 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
@@ -1,160 +0,0 @@
-
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc
@@ -0,0 +1,244 @@
+[% USE Koha %]
+[% BLOCK 'alt-address-style' %]
+
+[% END %]
+
+[% BLOCK 'member-alt-address-style-us' %]
+ [% PROCESS 'alt-address-style_B_streetnumber' %]
+ [% PROCESS 'alt-address-style_roadtypes' %]
+ [% PROCESS 'alt-address-style_B_address' %]
+ [% PROCESS 'alt-address-style_B_address2' %]
+ [% PROCESS 'alt-address-style_B_city' %]
+ [% PROCESS 'alt-address-style_B_state' %]
+ [% PROCESS 'alt-address-style_B_zipcode' %]
+ [% PROCESS 'alt-address-style_B_country' %]
+ [% PROCESS 'alt-address-style_B_phone' %]
+ [% PROCESS 'alt-address-style_B_email' %]
+ [% PROCESS 'alt-address-style_B_contactnote' %]
+[% END %]
+
+[% BLOCK 'member-alt-address-style-de' %]
+ [% PROCESS 'alt-address-style_roadtypes' %]
+ [% PROCESS 'alt-address-style_B_address' %]
+ [% PROCESS 'alt-address-style_B_streetnumber' %]
+ [% PROCESS 'alt-address-style_B_address2' %]
+ [% PROCESS 'alt-address-style_B_zipcode' %]
+ [% PROCESS 'alt-address-style_B_city' %]
+ [% PROCESS 'alt-address-style_B_state' %]
+ [% PROCESS 'alt-address-style_B_country' %]
+ [% PROCESS 'alt-address-style_B_phone' %]
+ [% PROCESS 'alt-address-style_B_email' %]
+ [% PROCESS 'alt-address-style_B_contactnote' %]
+[% END %]
+
+[% BLOCK 'member-alt-address-style-fr' %]
+ [% PROCESS 'alt-address-style_B_streetnumber' %]
+ [% PROCESS 'alt-address-style_roadtypes' %]
+ [% PROCESS 'alt-address-style_B_address' %]
+ [% PROCESS 'alt-address-style_B_address2' %]
+ [% PROCESS 'alt-address-style_B_zipcode' %]
+ [% PROCESS 'alt-address-style_B_city' %]
+ [% PROCESS 'alt-address-style_B_state' %]
+ [% PROCESS 'alt-address-style_B_country' %]
+ [% PROCESS 'alt-address-style_B_phone' %]
+ [% PROCESS 'alt-address-style_B_email' %]
+ [% PROCESS 'alt-address-style_B_contactnote' %]
+[% END %]
+
+[% BLOCK 'alt-address-style_roadtypes' %]
+ [% IF roadtypes %]
+
+ [% IF ( mandatoryB_streettype ) %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_address' %]
+ [% UNLESS noB_address %]
+
+ [% IF ( mandatoryB_address ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address:
+
+ [% IF ( mandatoryB_address ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_streetnumber' %]
+ [% UNLESS noB_streetnumber %]
+
+ [% IF ( mandatoryB_streetnumber ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Street Number:
+
+ [% IF ( mandatoryB_streetnumber ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_address2' %]
+ [% UNLESS noB_address2 %]
+
+ [% IF ( mandatoryB_address2 ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Address 2:
+
+ [% IF ( mandatoryB_address2 ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_zipcode' %]
+ [% UNLESS noB_zipcode %]
+
+ [% IF ( mandatoryB_zipcode ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ ZIP/Postal code:
+
+ [% IF ( mandatoryB_zipcode ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_city' %]
+ [% UNLESS noB_city %]
+
+ [% IF ( mandatoryB_city ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ City:
+
+ [% IF cities.count %]
+ or choose
+
+ [% END %]
+ [% IF ( mandatoryB_city ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_state' %]
+ [% UNLESS noB_state %]
+
+ [% IF ( mandatoryB_state ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ State:
+
+ [% IF ( mandatoryB_state ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_country' %]
+ [% UNLESS noB_country %]
+
+ [% IF ( mandatoryB_country ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Country:
+
+ [% IF ( mandatoryB_country ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_phone' %]
+ [% UNLESS noB_phone %]
+
+ [% IF ( mandatoryB_phone ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Phone:
+
+ [% IF ( mandatoryB_phone ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_email' %]
+ [% UNLESS noB_email %]
+
+ [% IF ( mandatoryB_email ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Email:
+
+ [% IF ( mandatoryB_email ) %]Required[% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'alt-address-style_B_contactnote' %]
+ [% UNLESS nocontactnote %]
+
+ [% IF ( mandatorycontactnote ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ Contact note:
+
+ [% IF ( mandatorycontactnote ) %]Required[% END %]
+
+ [% END %]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -5,6 +5,7 @@
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]
+[% PROCESS 'member-alt-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Patrons ›
@@ -739,11 +740,7 @@ legend:hover {
[% IF ( step_6 ) %]
[% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-alt-address-style-us.inc' %]
- [% END %]
+ [% PROCESS 'alt-address-style' %]
[% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
[% END # /IF ( step_6 ) %]
--