From b2c34bde8bf7bd3ed7ab7167d6f0944759fb56df Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 11 Jul 2019 10:16:35 +0000
Subject: [PATCH] Bug 23299: Switch address1 and streetnumber for German
 address format on opac-memberentry

Test plan:
Toggle value of pref AddressFormat and verify change on opac-memberentry.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../bootstrap/en/modules/opac-memberentry.tt  | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index 862091afe9..0b6e26c0be 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -7,6 +7,20 @@
 [% USE KohaDates %]
 [% USE Math %]
 [% SET userupdateview = 1 %]
+[% BLOCK streetnumber %]
+    [% UNLESS hidden.defined('streetnumber') %]
+        <li>
+            [% IF mandatory.defined('streetnumber') %]
+                <label for="borrower_streetnumber" class="required">Street number:</label>
+            [% ELSE %]
+                <label for="borrower_streetnumber">Street number:</label>
+            [% END %]
+
+            <input type="text" id="borrower_streetnumber" name="borrower_streetnumber" value="[% borrower.streetnumber | html %]" />
+            [% IF mandatory.defined('streetnumber') %]<span class="required">Required</span>[% END %]
+        </li>
+    [% END %]
+[% END %]
 
 [% INCLUDE 'doc-head-open.inc' %]
     <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; [% IF action == 'edit' %]Update your personal details[% ELSE %]Register a new account[% END %]</title>
@@ -370,18 +384,7 @@
                         <legend id="mainaddress_legend">Main address</legend>
 
                         <ol>
-                            [% UNLESS hidden.defined('streetnumber') %]
-                                <li>
-                                    [% IF mandatory.defined('streetnumber') %]
-                                        <label for="borrower_streetnumber" class="required">Street number:</label>
-                                    [% ELSE %]
-                                        <label for="borrower_streetnumber">Street number:</label>
-                                    [% END %]
-
-                                    <input type="text" id="borrower_streetnumber" name="borrower_streetnumber" value="[% borrower.streetnumber | html %]" />
-                                    [% IF mandatory.defined('streetnumber') %]<span class="required">Required</span>[% END %]
-                                </li>
-                            [% END %]
+                            [% IF Koha.Preference('AddressFormat') != 'de' %][% INCLUDE streetnumber %][% END %]
 
                             [% UNLESS hidden.defined('address') %]
                                 <li>
@@ -396,6 +399,8 @@
                                 </li>
                             [% END %]
 
+                            [% IF Koha.Preference('AddressFormat') == 'de' %][% INCLUDE streetnumber %][% END %]
+
                             [% UNLESS hidden.defined('address2') %]
                                 <li>
                                     [% IF mandatory.defined('address2') %]