From 8b43b262aa0a67d827c9959411186a18cbe51962 Mon Sep 17 00:00:00 2001
From: Fridolin Somers <fridolin.somers@biblibre.com>
Date: Tue, 23 Jun 2020 09:25:33 +0200
Subject: [PATCH] Bug 25842: Fix typo streetype in
 member-main-address-style.inc

There are several more instances of the incorrect variable "streetype" in member-main-address-style.inc. Must be corrected with DB column name "streettype" in order to be able to set this field as mandatory.

See also :
Bug 25839 - Typo patron.streetype in member-main-address-style.inc

Test plan :
1) Add "streettype" in system preference "BorrowerMandatoryField"
2) Create a new patron
3) Without patch "Street type" field is not mandatory/required, with
   patch it is
4) Remove "streettype" from system preference "BorrowerMandatoryField"
5) Create a new patron
6) Check "Street type" field is not mandatory/required
7) Select a value and save
8) Edit again patron
9) Check value is selected

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 3ebfc94a5724a0dd63f565f9744800c98d70f9cf)
---
 .../prog/en/includes/member-main-address-style.inc     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
index edee601741..bd384ed1b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc
@@ -48,13 +48,13 @@
 [% BLOCK 'address-style_roadtypes' %]
     [% IF roadtypes %]
         <li>
-            [% IF ( mandatorystreetype ) %]
-                <label for="streetype" class="required">
+            [% IF ( mandatorystreettype ) %]
+                <label for="streettype" class="required">
             [% ELSE %]
-                <label for="streetype">
+                <label for="streettype">
             [% END %]
             Street type: </label>
-            <select name="streetype">
+            <select name="streettype">
                 <option value=""></option>
                 [% FOR roadtype IN roadtypes %]
                     [% IF roadtype.authorised_value == patron.streettype %]
@@ -64,7 +64,7 @@
                     [% END %]
                 [% END %]
             </select>
-            [% IF ( mandatorystreetype ) %]<span class="required">Required</span>[% END %]
+            [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
         </li>
     [% END %]
 [% END %]
-- 
2.39.5