Additional fixes for Bug 5422, Separate state field for patron's adresses

Adding state variable to various circ and member pages so that
sidebar display of patron details includes state.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 5242193..bcda99f 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -654,6 +654,7 @@ $template->param(
     emailpro          => $borrower->{'emailpro'},
     borrowernotes     => $borrower->{'borrowernotes'},
     city              => $borrower->{'city'},
+    state              => $borrower->{'state'},
     zipcode           => $borrower->{'zipcode'},
     country           => $borrower->{'country'},
     phone             => $borrower->{'phone'} || $borrower->{'mobile'},

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 8cf2e48..452effc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -21,9 +21,8 @@
         <li><!-- TMPL_VAR NAME="address2" --></li>
     <!-- /TMPL_IF --><li> 
     <!-- TMPL_IF NAME="city" -->
-            <!-- TMPL_VAR NAME="city" -->
-           <!-- TMPL_VAR NAME="zipcode" -->
-           <!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
+            <!-- TMPL_VAR NAME="city" --><!-- TMPL_IF NAME="state" -->, <!-- TMPL_VAR NAME="state" --><!-- /TMPL_IF -->
+           <!-- TMPL_VAR NAME="zipcode" --><!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
         <span class="empty">No city stored.</span>
     <!-- /TMPL_IF --></li>

diff --git a/members/boraccount.pl b/members/boraccount.pl
index 5509f3d..b91684a 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -109,6 +109,7 @@ $template->param(
     address             => $data->{'address'},
     address2            => $data->{'address2'},
     city                => $data->{'city'},
+    state               => $data->{'state'},
     zipcode             => $data->{'zipcode'},
     country             => $data->{'country'},
     phone               => $data->{'phone'},

diff --git a/members/mancredit.pl b/members/mancredit.pl
index 0e80861..7db4bbd 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -83,6 +83,7 @@ if ($add){
                    address => $data->{'address'},
                    address2 => $data->{'address2'},
                    city => $data->{'city'},
+                   state => $data->{'state'},
                    zipcode => $data->{'zipcode'},
                    country => $data->{'country'},
                    phone => $data->{'phone'},

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 50595ad..521989b 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -111,6 +111,7 @@ if ($add){
                address => $data->{'address'},
                address2 => $data->{'address2'},
                city => $data->{'city'},
+               state => $data->{'state'},
                zipcode => $data->{'zipcode'},
                country => $data->{'country'},
                phone => $data->{'phone'},

diff --git a/members/member-flags.pl b/members/member-flags.pl
index 321e526..007b56c 100755 (executable)
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -173,6 +173,7 @@ $template->param(
                address => $bor->{'address'},
                address2 => $bor->{'address2'},
                city => $bor->{'city'},
+        state => $bor->{'state'},
                zipcode => $bor->{'zipcode'},
                country => $bor->{'country'},
                phone => $bor->{'phone'},

diff --git a/members/member-password.pl b/members/member-password.pl
index 67f96db..0fefe4f 100755 (executable)
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -101,6 +101,7 @@ $template->param( picture => 1 ) if $picture;
            address => $bor->{'address'},
            address2 => $bor->{'address2'},
            city => $bor->{'city'},
+           state => $bor->{'state'},
            zipcode => $bor->{'zipcode'},
            country => $bor->{'country'},
            phone => $bor->{'phone'},

diff --git a/members/pay.pl b/members/pay.pl
index cefdfba..06e103d 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -157,6 +157,7 @@ $template->param( picture => 1 ) if $picture;
        address => $data->{'address'},
        address2 => $data->{'address2'},
        city => $data->{'city'},
+    state => $data->{'state'},
        zipcode => $data->{'zipcode'},
        country => $data->{'country'},
        phone => $data->{'phone'},

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 3ee6a8f..e7586a0 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -113,6 +113,7 @@ $template->param(
                                            address => $data->{'address'},
                                                address2 => $data->{'address2'},
                                            city => $data->{'city'},
+                                           state => $data->{'state'},
                                                zipcode => $data->{'zipcode'},
                                                country => $data->{'country'},
                                                phone => $data->{'phone'},

diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 6f94eb8..d689217 100755 (executable)
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -85,7 +85,8 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
                         address         => $data->{'address'},
                         address2        => $data->{'address2'},
                         city            => $data->{'city'},
-                       zipcode         => $data->{'zipcode'},
+                        state           => $data->{'state'},
+                        zipcode         => $data->{'zipcode'},
                         phone           => $data->{'phone'},
                         phonepro        => $data->{'phonepro'},
                         email           => $data->{'email'},