[Koha-patches] [PATCH] bug 3765 [part 2] Additional updates to make addresss appear in full

[Nicole Engard]

Please ignore this patch

On Mon, Dec 28, 2009 at 6:09 AM, Nicole Engard <nengard at gmail.com> wrote:
> ---
>  circ/circulation.pl                                |    2 +-
>  .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    3 +++
>  members/boraccount.pl                              |    5 ++++-
>  tools/viewlog.pl                                   |    4 +++-
>  4 files changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/circ/circulation.pl b/circ/circulation.pl
> index 19df3bf..b6f6c84 100755
> --- a/circ/circulation.pl
> +++ b/circ/circulation.pl
> @@ -661,7 +661,7 @@ if($bor_messages_loop){ $template->param(flagged => 1 ); }
>
>  # Computes full borrower address
>  my (undef, $roadttype_hashref) = &GetRoadTypes();
> -my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
> +my $address = $borrower->{'streetnumber'}.' '.$borrower->{'address'}.' '.$roadttype_hashref->{$borrower->{'streettype'}};
>
>  $template->param(
>     issued_itemtypes_count_loop => \@issued_itemtypes_count_loop,
> 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 443e12b..4b182a8 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
> +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
> @@ -13,6 +13,9 @@
>  <!-- /TMPL_IF -->
>  <!-- /TMPL_IF -->
>     <li><!-- TMPL_IF NAME="address"-->
> +            <!--TMPL_IF NAME="streetnumber"-->
> +                <!-- TMPL_VAR NAME="streetnumber" -->
> +            <!-- /TMPL_IF -->
>             <!-- TMPL_VAR NAME="address" -->
>             <!--TMPL_IF NAME="roaddetails"-->
>                 <!-- TMPL_VAR NAME="roaddetails" -->
> diff --git a/members/boraccount.pl b/members/boraccount.pl
> index 6233e78..7f582b7 100755
> --- a/members/boraccount.pl
> +++ b/members/boraccount.pl
> @@ -113,6 +113,9 @@ $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
>  my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
>  $template->param( picture => 1 ) if $picture;
>
> +my (undef, $roadttype_hashref) = &GetRoadTypes();
> +my $address = $data->{'streetnumber'}.' '.$data->{'address'}.' '.$roadttype_hashref->{$data->{'streettype'}};
> +
>  $template->param(
>     finesview           => 1,
>     firstname           => $data->{'firstname'},
> @@ -123,7 +126,7 @@ $template->param(
>     category_type       => $data->{'category_type'},
>  #   category_description => $data->{'description'},
>     categoryname                => $data->{'description'},
> -    address             => $data->{'address'},
> +    address             => $address,
>     address2            => $data->{'address2'},
>     city                => $data->{'city'},
>     zipcode             => $data->{'zipcode'},
> diff --git a/tools/viewlog.pl b/tools/viewlog.pl
> index 3b4be0e..6c164c7 100755
> --- a/tools/viewlog.pl
> +++ b/tools/viewlog.pl
> @@ -73,6 +73,8 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
>     my $borrowernumber = $object;
>     my $data = GetMember('borrowernumber'=>$borrowernumber);
>     my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
> +    my (undef, $roadttype_hashref) = &GetRoadTypes();
> +    my $address = $data->{'streetnumber'}.' '.$data->{'address'}.' '.$roadttype_hashref->{$data->{'streettype'}};
>     $template->param( picture => 1 ) if $picture;
>     $template->param(   menu            => 1,
>                         title           => $data->{'title'},
> @@ -83,7 +85,7 @@ if ($src eq 'circ') {   # if we were called from circulation, use the circulatio
>                         cardnumber      => $data->{'cardnumber'},
>                         categorycode    => $data->{'categorycode'},
>                         categoryname   => $data->{'description'},
> -                        address         => $data->{'address'},
> +                        address         => $address,
>                         address2        => $data->{'address2'},
>                         city            => $data->{'city'},
>                        zipcode         => $data->{'zipcode'},
> --
> 1.5.6.5
>
>