From e82f88d5d97dbf478dd3598e3ccbfe60f602588d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 7 Apr 2011 11:41:32 +0200 Subject: [PATCH] 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 Signed-off-by: Chris Cormack --- circ/circulation.pl | 1 + koha-tmpl/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 524219355e..bcda99fd09 100755 --- 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 8cf2e480de..452effc931 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 @@
  • - - - , + , + , No city stored.
  • diff --git a/members/boraccount.pl b/members/boraccount.pl index 5509f3db77..b91684a3db 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 0e80861d2d..7db4bbdcea 100755 --- 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 50595adab3..521989bd6d 100755 --- 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 321e5260fb..007b56cdd7 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 67f96db933..0fefe4fa67 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 cefdfba47f..06e103d2c3 100755 --- 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 3ee6a8fe8b..e7586a0deb 100755 --- 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 6f94eb8f18..d689217bbc 100755 --- 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'}, -- 2.39.5