[Koha-patches] [PATCH] [SIGNED-OFF 3/7] Additional fixes for Bug 5422, Separate state field for patron's adresses
Magnus Enger
magnus at enger.priv.no
Thu Apr 7 11:41:32 CEST 2011
From: Owen Leonard <oleonard at myacpl.org>
Adding state variable to various circ and member pages so that
sidebar display of patron details includes state.
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
---
circ/circulation.pl | 1 +
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 5 ++---
members/boraccount.pl | 1 +
members/mancredit.pl | 1 +
members/maninvoice.pl | 1 +
members/member-flags.pl | 1 +
members/member-password.pl | 1 +
members/pay.pl | 1 +
members/readingrec.pl | 1 +
tools/viewlog.pl | 3 ++-
10 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 7c4a0dc..e536fdd 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -636,6 +636,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 56dd2f2..1743016 100644
--- 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
--- 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 51b71d6..f22590d 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -82,6 +82,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 df12a2a..fa7c1f8 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -110,6 +110,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
--- 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
--- 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 5a36bd7..fa1a148 100755
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -156,6 +156,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 bd6ca82..b0a71ef 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -123,6 +123,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 84c2474..1f5064f 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -86,7 +86,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'},
--
1.7.1
More information about the Koha-patches
mailing list