From 1ac250ea277d759161e3f2a53f9714d6f94b84bb Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Hinderer?= <Sebastien.Hinderer@ens-lyon.org>
Date: Mon, 27 Jul 2009 11:43:24 +0200
Subject: [PATCH] bug 3440: Modifies branches script and template so that the
 newly added rows are taken into account.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---
 admin/branches.pl                             | 19 +++++++++++++++----
 .../prog/en/modules/admin/branches.tmpl       | 15 +++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/admin/branches.pl b/admin/branches.pl
index ed7625c971..10ebe34ac6 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -214,10 +214,15 @@ sub editbranchform {
              branchaddress1 => $data->{'branchaddress1'},
              branchaddress2 => $data->{'branchaddress2'},
              branchaddress3 => $data->{'branchaddress3'},
+             branchzip      => $data->{'branchzip'},
+             branchcity     => $data->{'branchcity'},
+             branchcountry  => $data->{'branchcountry'},
              branchphone    => $data->{'branchphone'},
              branchfax      => $data->{'branchfax'},
              branchemail    => $data->{'branchemail'},
-             branchip       => $data->{'branchip'} 
+             branchurl      => $data->{'branchurl'},
+             branchip       => $data->{'branchip'},
+             branchnotes    => $data->{'branchnotes'}, 
         );
     }
 
@@ -301,9 +306,13 @@ sub branchinfotable {
         # - branchaddress1 \
         # - branchaddress2  |
         # - branchaddress3  | comprising the old "address" field
+        # - branchzip       |
+        # - branchcity      |
+        # - branchcountry   |
         # - branchphone     |
         # - branchfax       |
         # - branchemail    /
+        # - branchurl      /
         # - address-empty-p (1 if no address information, 0 otherwise)
         # - categories      (containing a static error message)
         # - category_list   (loop containing "categoryname")
@@ -316,9 +325,11 @@ sub branchinfotable {
         my $address_empty_p = 1;
         for my $field (
             'branchaddress1', 'branchaddress2',
-            'branchaddress3', 'branchphone',
-            'branchfax',      'branchemail',
-            'branchip',       'branchprinter'
+            'branchaddress3', 'branchzip',
+            'branchcity', 'branchcountry',
+            'branchphone', 'branchfax',
+            'branchemail', 'branchurl',
+            'branchip',       'branchprinter', 'branchnotes'
           )
         {
             $row{$field} = $branch->{$field};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 2b71304260..2d03b63ba1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -109,9 +109,13 @@
         <li><label for="branchaddress1">Address Line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></li>
         <li><label for="branchaddress2">Address Line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></li>
         <li><label for="branchaddress3">Address Line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></li>
+        <li><label for="branchzip">Zip/Postal Code</label><input type="text" name="branchzip" id="branchzip" value="<!-- TMPL_VAR name="branchzip" escape="HTML" -->" /></li>
+        <li><label for="branchcity">City</label><input type="text" name="branchcity" id="branchcity" value="<!-- TMPL_VAR name="branchcity" escape="HTML" -->" /></li>
+        <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="<!-- TMPL_VAR name="branchcountry" escape="HTML" -->" /></li>
         <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></li>
         <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></li>
         <li><label for="branchemail">Email</label><input type="text" name="branchemail" id="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></li>
+        <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="<!-- TMPL_VAR name="branchurl" escape="HTML" -->" /></li>
         <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
 		<!--
         <li><label for="branchprinter">Library Printer</label>
@@ -126,6 +130,7 @@
                 <!-- /TMPL_LOOP -->
             </select></li>
 			-->
+        <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="<!-- TMPL_VAR name="branchnotes" escape="HTML" -->" /></li>
         </ol>
         </fieldset>
         <fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a></fieldset>
@@ -183,12 +188,22 @@
                             <br /><!-- TMPL_VAR name="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
                         <!-- TMPL_IF name="branchaddress3" -->
                             <br /><!-- TMPL_VAR name="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchzip" -->
+                            <br /><!-- TMPL_VAR name="branchzip" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchcity" -->
+                            <br /><!-- TMPL_VAR name="branchcity" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchcountry" -->
+                            <br /><!-- TMPL_VAR name="branchcountry" escape="HTML" --><!-- /TMPL_IF -->
                         <!-- TMPL_IF name="branchphone" -->
                             <br />Ph: <!-- TMPL_VAR name="branchphone" escape="HTML" --><!-- /TMPL_IF -->
                         <!-- TMPL_IF name="branchfax" -->
                             <br />Fax: <!-- TMPL_VAR name="branchfax" escape="HTML" --><!-- /TMPL_IF -->
                         <!-- TMPL_IF name="branchemail" -->
                             <br />Email: <!-- TMPL_VAR name="branchemail" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchurl" -->
+                            <br />URL: <!-- TMPL_VAR name="branchurl" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchnotes" -->
+                            <br />Notes: <!-- TMPL_VAR name="branchnotesl" escape="HTML" --><!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
                 </td>
                 <td>
-- 
2.20.1