From 4ca0fda432f1e17e2e9e5c854163fa098b816c0b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Tue, 14 Jun 2016 08:41:03 +0200
Subject: [PATCH] Bug 16730 - Use member-display-address-style*-includes in
 moremember-brief.tt
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

To test:
- Apply patch
- Create a new patron with the same first and last name as an existing
  patron. This should trigger a duplicate warning message. Click the
  "View existing record" link to trigger a pop-up window with a patron
  detail brief view.
- Verify that the address information displays the same way as on the
  patron details screen (moremember.pl).
- Change syspref 'AddressFormat' and verify that the address displays
  as appropriate.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Works as described: AddressFormat is taken into account on 'view exiting
  record' dialog box.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f542ce5a82a40b503b10c709b8b960ace2637f7d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a7e0bc97113b7ac8f08c417ccd4060f2067cf5fe)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 .../en/modules/members/moremember-brief.tt    | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 34367d89e3..cbe2a2d9d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Check duplicate patron</title>
@@ -16,17 +17,13 @@
 	<div id="patron-information" style="padding: .5em;">
 
      [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
-
-	<p class="address">[% streetnumber %]
-        [% IF ( roaddetails ) %]
-         [% roaddetails %]
-        [% END %]
-        [% address %]<br />
-        [% IF ( address2 ) %][% address2 %]<br />[% END %]
-        [% IF ( city ) %][% city %][% END %]
-        [% IF ( zipcode ) %][% zipcode %]<br />[% END %]
-        [% IF ( country ) %][% country %][% END %]</p>
-
+        <div class = "address">
+            [% IF Koha.Preference( 'AddressFormat' ) %]
+                [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+            [% ELSE %]
+                [% INCLUDE 'member-display-address-style-us.inc' %]
+            [% END %]
+        </div>
 	<div class="rows">
 		<ol>
         [% IF ( I ) %]
-- 
2.39.5