From 3e576f65b2dff4616d8b57d8f31dea1a3a402ffc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Tue, 14 Jun 2016 10:14:29 +0200
Subject: [PATCH] Bug 10760: Alternate Address: Make street number and street
 type editable

Table 'borrowers' contain columns B_streetnumber and B_streettype.
This patch makes them editable for alternate address.

To test:
- Apply patch
- Edit a patron's details
- Verify that in edit mode for Alternate address, the fields 'street type' and 'street number' appear
  and follow the settings in sysprefs AddressFormat, BorrowerMandatoryField, BorrowerUnwantedField
- Verify that the values are saved correctly.

Note: A second patch will follow to manage the display of street number and street type
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../includes/member-alt-address-style-de.inc  | 36 +++++++++++++++++++
 .../includes/member-alt-address-style-us.inc  | 35 ++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
index 3893497c02..43385f268c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
@@ -12,6 +12,42 @@
       [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
+
+        [% IF roadtypes %]
+                <li>
+            [% IF ( mandatoryB_streettype ) %]
+                <label for="B_streettype" class="required">
+            [% ELSE %]
+                <label for="B_streettype">
+        [% END %]
+            Street type: </label>
+            <select name="B_streettype">
+            <option value=""></option>
+            [% FOR roadtype IN roadtypes %]
+                [% IF roadtype.authorised_value == B_streettype %]
+                    <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
+                [% ELSE %]
+                    <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
+                [% END %]
+            [% END %]
+            </select>
+            [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
+            </li>
+        [% END %]
+
+        [% UNLESS noB_streetnumber %]
+            <li>
+                [% IF ( mandatoryB_streetnumber ) %]
+                    <label for="B_streetnumber" class="required">
+                [% ELSE %]
+                    <label for="B_streetnumber">
+                [% END %]
+                Street Number: </label>
+                    <input type="text" id="B_address" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
+                [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
+            </li>
+        [% END %]
+
         [% UNLESS noB_address2 %]
             <li>
                 [% IF ( mandatoryB_address2 ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
index e6b31ff864..7c4adbdc39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
@@ -1,5 +1,40 @@
         <fieldset class="rows" id="memberentry_address">
         <legend id="alt_address_lgd">Alternate address</legend><ol>
+        [% UNLESS noB_streetnumber %]
+            <li>
+                [% IF ( mandatoryB_streetnumber ) %]
+                    <label for="B_streetnumber" class="required">
+                [% ELSE %]
+                    <label for="B_streetnumber">
+                [% END %]
+                Street Number: </label>
+                <input type="text" id="B_address" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
+               [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
+            </li>
+        [% END %]
+
+        [% IF roadtypes %]
+                <li>
+            [% IF ( mandatoryB_streettype ) %]
+                <label for="B_streettype" class="required">
+            [% ELSE %]
+                <label for="B_streettype">
+        [% END %]
+        Street type: </label>
+        <select name="B_streettype">
+        <option value=""></option>
+        [% FOR roadtype IN roadtypes %]
+            [% IF roadtype.authorised_value == B_streettype %]
+                <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
+            [% ELSE %]
+                <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
+            [% END %]
+        [% END %]
+        </select>
+        [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %]
+        </li>
+      [% END %]
+
         [% UNLESS noB_address %]
             <li>
                 [% IF ( mandatoryB_address ) %]
-- 
2.39.5