@@ -, +, @@
---
.../prog/en/includes/circ-menu.inc | 7 +-
.../member-display-address-style-de.inc | 16 ----
.../member-display-address-style-fr.inc | 19 -----
.../member-display-address-style-us.inc | 16 ----
.../includes/member-display-address-style.inc | 74 +++++++++++++++++++
.../prog/en/modules/circ/returns.tt | 7 +-
.../en/modules/members/moremember-brief.tt | 7 +-
.../en/modules/members/moremember-print.tt | 7 +-
.../prog/en/modules/members/moremember.tt | 7 +-
9 files changed, 84 insertions(+), 76 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,5 +1,6 @@
[% USE Koha %]
[% USE KohaDates %]
+[% PROCESS 'member-display-address-style.inc' %]
[% IF ( patron.borrowernumber ) %]
[% INCLUDE 'patron-title.inc' %]
@@ -29,11 +30,7 @@
[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
- [% END %]
+ [% PROCESS 'display-address-style' %]
[% IF ( patron.phone || patron.mobile || patron.phonepro ) %]-
[% IF ( patron.phone ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
@@ -1,16 +0,0 @@
-[% IF ( patron.address or patron.address2 ) %]
- [% IF ( patron.address ) %]
- [% SET roadtype_desc = '' %]
- [% IF patron.streettype %]
- [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
- [% END %]
-
- [% patron.address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber | html %][% END %]
- [% END %]
- [% IF ( patron.address2 ) %]
- - [% patron.address2 | html %]
- [% END %]
-[% END %]
-[% IF ( patron.city ) %]-
- [%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %][% patron.state | html %][% END %]
- [% IF ( patron.country ) %]
[% patron.country | html %][% END %]
-[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
@@ -1,19 +0,0 @@
-[% IF ( patron.address or patron.address2 ) %]
- [% IF ( patron.address ) %]
- [% SET roadtype_desc = '' %]
- [% IF patron.streettype %]
- [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
- [% END %]
- - [% IF patron.streetnumber %][% patron.streetnumber | html %] [% END %]
- [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
- [% patron.address | html %]
-
- [% END %]
- [% IF ( patron.address2 ) %]
- - [% patron.address2 | html %]
- [% END %]
-[% END %]
-[% IF ( patron.city ) %]
- - [%IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %][% patron.state | html %][% END %]
- [% IF ( patron.country ) %]
[% patron.country | html %][% END %]
-[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc
@@ -1,16 +0,0 @@
-[% IF ( patron.address or patron.address2 ) %]
- [% IF ( patron.address ) %]
- [% SET roadtype_desc = '' %]
- [% IF patron.streettype %]
- [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
- [% END %]
- - [% if (patron.streetnumber) | html %][% patron.streetnumber |html %][% end | html %] [% patron.address | html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end | html %]
- [% END %]
- [% IF ( patron.address2 ) %]
- - [% patron.address2 |html %]
- [% END %]
-[% END %]
-[% IF ( patron.city ) %]-
- [% patron.city |html %][% IF ( patron.state ) %], [% patron.state |html %][% END %]
- [% patron.zipcode |html %][% IF ( patron.country ) %], [% patron.country |html %][% END %]
-[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
@@ -0,0 +1,74 @@
+[% USE Koha %]
+[% BLOCK 'display-address-style' %]
+ [% IF Koha.Preference( 'AddressFormat' ) %]
+ [% PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
+ [% ELSE %]
+ [% PROCESS 'member-display-address-style-us' %]
+ [% END %]
+[% END %]
+
+[% BLOCK 'member-display-address-style-us' %]
+ [% IF ( patron.address or patron.address2 ) %]
+ [% IF ( patron.address ) %]
+ [% SET roadtype_desc = '' %]
+ [% IF patron.streettype %]
+ [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
+ [% END %]
+ - [% if (patron.streetnumber) | html %][% patron.streetnumber |html %][% end | html %] [% patron.address | html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end | html %]
+ [% END %]
+ [% IF ( patron.address2 ) %]
+ - [% patron.address2 |html %]
+ [% END %]
+ [% END %]
+ [% IF ( patron.city ) %]
+ -
+ [% patron.city |html %][% IF ( patron.state ) %], [% patron.state |html %][% END %]
+ [% patron.zipcode |html %][% IF ( patron.country ) %], [% patron.country |html %][% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'member-display-address-style-de' %]
+ [% IF ( patron.address or patron.address2 ) %]
+ [% IF ( patron.address ) %]
+ [% SET roadtype_desc = '' %]
+ [% IF patron.streettype %]
+ [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
+ [% END %]
+ - [% patron.address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber | html %][% END %]
+ [% END %]
+ [% IF ( patron.address2 ) %]
+ - [% patron.address2 | html %]
+ [% END %]
+ [% END %]
+ [% IF ( patron.city ) %]
+ -
+ [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %][% patron.state | html %][% END %]
+ [% IF ( patron.country ) %]
[% patron.country | html %][% END %]
+
+ [% END %]
+[% END %]
+
+[% BLOCK 'member-display-address-style-fr' %]
+ [% IF ( patron.address or patron.address2 ) %]
+ [% IF ( patron.address ) %]
+ [% SET roadtype_desc = '' %]
+ [% IF patron.streettype %]
+ [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
+ [% END %]
+ - [% IF patron.streetnumber %][% patron.streetnumber | html %] [% END %]
+ [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
+ [% patron.address | html %]
+
+ [% END %]
+ [% IF ( patron.address2 ) %]
+ - [% patron.address2 | html %]
+ [% END %]
+ [% END %]
+ [% IF ( patron.city ) %]
+ -
+ [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %][% patron.state | html %][% END %]
+ [% IF ( patron.country ) %]
[% patron.country | html %][% END %]
+
+ [% END %]
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -6,6 +6,7 @@
[% USE ItemTypes %]
[% USE AuthorisedValues %]
[% USE ColumnsSettings %]
+[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% BLOCK display_bormessagepref %]
[% IF ( bormessagepref ) %]
@@ -23,11 +24,7 @@
[% END %]
[% BLOCK display_holdpatron_address %]
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
- [% END %]
+ [% PROCESS 'display-address-style' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -1,6 +1,7 @@
[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
+[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Check duplicate patron
@@ -21,11 +22,7 @@
[% IF ( patron.othernames ) %]“[% patron.othernames | html %]”[% END %]
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
- [% END %]
+ [% PROCESS 'display-address-style' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -3,6 +3,7 @@
[% USE KohaDates %]
[% USE Price %]
[% USE ItemTypes %]
+[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% PROCESS 'accounts.inc' %]
@@ -17,11 +18,7 @@
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
- [% END %]
+ [% PROCESS 'display-address-style' %]
- [% IF ( patron.phone ) %][% patron.phone | html %][% ELSE %](no phone number on file)[% END %]
- [% IF ( patron.email ) %][% patron.email | html %][% ELSE %](no primary email on file)[% END %]
[% IF ( patron.emailpro ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -6,6 +6,7 @@
[% USE AuthorisedValues %]
[% USE ColumnsSettings %]
[% USE Price %]
+[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
@@ -184,11 +185,7 @@
- [% IF Koha.Preference( 'AddressFormat' ) %]
- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
- [% ELSE %]
- [% INCLUDE 'member-display-address-style-us.inc' %]
- [% END %]
+ [% PROCESS 'display-address-style' %]
--