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>
This commit is contained in:
Owen Leonard 2011-04-07 11:41:32 +02:00 committed by Chris Cormack
parent 21727e00f5
commit e82f88d5d9
10 changed files with 12 additions and 4 deletions

View file

@ -654,6 +654,7 @@ $template->param(
emailpro => $borrower->{'emailpro'}, emailpro => $borrower->{'emailpro'},
borrowernotes => $borrower->{'borrowernotes'}, borrowernotes => $borrower->{'borrowernotes'},
city => $borrower->{'city'}, city => $borrower->{'city'},
state => $borrower->{'state'},
zipcode => $borrower->{'zipcode'}, zipcode => $borrower->{'zipcode'},
country => $borrower->{'country'}, country => $borrower->{'country'},
phone => $borrower->{'phone'} || $borrower->{'mobile'}, phone => $borrower->{'phone'} || $borrower->{'mobile'},

View file

@ -21,9 +21,8 @@
<li><!-- TMPL_VAR NAME="address2" --></li> <li><!-- TMPL_VAR NAME="address2" --></li>
<!-- /TMPL_IF --><li> <!-- /TMPL_IF --><li>
<!-- TMPL_IF NAME="city" --> <!-- TMPL_IF NAME="city" -->
<!-- TMPL_VAR NAME="city" --> <!-- TMPL_VAR NAME="city" --><!-- TMPL_IF NAME="state" -->, <!-- TMPL_VAR NAME="state" --><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="zipcode" --><!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
<!-- TMPL_ELSE --> <!-- TMPL_ELSE -->
<span class="empty">No city stored.</span> <span class="empty">No city stored.</span>
<!-- /TMPL_IF --></li> <!-- /TMPL_IF --></li>

View file

@ -109,6 +109,7 @@ $template->param(
address => $data->{'address'}, address => $data->{'address'},
address2 => $data->{'address2'}, address2 => $data->{'address2'},
city => $data->{'city'}, city => $data->{'city'},
state => $data->{'state'},
zipcode => $data->{'zipcode'}, zipcode => $data->{'zipcode'},
country => $data->{'country'}, country => $data->{'country'},
phone => $data->{'phone'}, phone => $data->{'phone'},

View file

@ -83,6 +83,7 @@ if ($add){
address => $data->{'address'}, address => $data->{'address'},
address2 => $data->{'address2'}, address2 => $data->{'address2'},
city => $data->{'city'}, city => $data->{'city'},
state => $data->{'state'},
zipcode => $data->{'zipcode'}, zipcode => $data->{'zipcode'},
country => $data->{'country'}, country => $data->{'country'},
phone => $data->{'phone'}, phone => $data->{'phone'},

View file

@ -111,6 +111,7 @@ if ($add){
address => $data->{'address'}, address => $data->{'address'},
address2 => $data->{'address2'}, address2 => $data->{'address2'},
city => $data->{'city'}, city => $data->{'city'},
state => $data->{'state'},
zipcode => $data->{'zipcode'}, zipcode => $data->{'zipcode'},
country => $data->{'country'}, country => $data->{'country'},
phone => $data->{'phone'}, phone => $data->{'phone'},

View file

@ -173,6 +173,7 @@ $template->param(
address => $bor->{'address'}, address => $bor->{'address'},
address2 => $bor->{'address2'}, address2 => $bor->{'address2'},
city => $bor->{'city'}, city => $bor->{'city'},
state => $bor->{'state'},
zipcode => $bor->{'zipcode'}, zipcode => $bor->{'zipcode'},
country => $bor->{'country'}, country => $bor->{'country'},
phone => $bor->{'phone'}, phone => $bor->{'phone'},

View file

@ -101,6 +101,7 @@ $template->param( picture => 1 ) if $picture;
address => $bor->{'address'}, address => $bor->{'address'},
address2 => $bor->{'address2'}, address2 => $bor->{'address2'},
city => $bor->{'city'}, city => $bor->{'city'},
state => $bor->{'state'},
zipcode => $bor->{'zipcode'}, zipcode => $bor->{'zipcode'},
country => $bor->{'country'}, country => $bor->{'country'},
phone => $bor->{'phone'}, phone => $bor->{'phone'},

View file

@ -157,6 +157,7 @@ $template->param( picture => 1 ) if $picture;
address => $data->{'address'}, address => $data->{'address'},
address2 => $data->{'address2'}, address2 => $data->{'address2'},
city => $data->{'city'}, city => $data->{'city'},
state => $data->{'state'},
zipcode => $data->{'zipcode'}, zipcode => $data->{'zipcode'},
country => $data->{'country'}, country => $data->{'country'},
phone => $data->{'phone'}, phone => $data->{'phone'},

View file

@ -113,6 +113,7 @@ $template->param(
address => $data->{'address'}, address => $data->{'address'},
address2 => $data->{'address2'}, address2 => $data->{'address2'},
city => $data->{'city'}, city => $data->{'city'},
state => $data->{'state'},
zipcode => $data->{'zipcode'}, zipcode => $data->{'zipcode'},
country => $data->{'country'}, country => $data->{'country'},
phone => $data->{'phone'}, phone => $data->{'phone'},

View file

@ -85,6 +85,7 @@ if ($src eq 'circ') { # if we were called from circulation, use the circulatio
address => $data->{'address'}, address => $data->{'address'},
address2 => $data->{'address2'}, address2 => $data->{'address2'},
city => $data->{'city'}, city => $data->{'city'},
state => $data->{'state'},
zipcode => $data->{'zipcode'}, zipcode => $data->{'zipcode'},
phone => $data->{'phone'}, phone => $data->{'phone'},
phonepro => $data->{'phonepro'}, phonepro => $data->{'phonepro'},