From 407beb5280ab1fc7d70894914612b762afb19aa1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 5 Jan 2016 14:37:20 +0000 Subject: [PATCH] Bug 15353: Display the patron image where needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On the 3 following pages, the patron image was not displayed: members/discharge.pl members/pay.pl members/paycollect.pl Test plan: Apply this patch and confirm the image is now displayed Followed test plan, image displays as expected. Signed-off-by: Marc VĂ©ron --- members/discharge.pl | 3 +++ members/pay.pl | 6 ++---- members/paycollect.pl | 7 +++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/members/discharge.pl b/members/discharge.pl index ad8408b..5f5fa2e 100755 --- a/members/discharge.pl +++ b/members/discharge.pl @@ -102,6 +102,9 @@ if ( $input->param('borrowernumber') ) { borrowernumber => $borrowernumber, }); + my ($picture, $dberror) = GetPatronImage($borrowernumber); + $template->param( picture => 1 ) if $picture; + $template->param( borrowernumber => $borrowernumber, biblionumber => $data->{'biblionumber'}, diff --git a/members/pay.pl b/members/pay.pl index 8a1b499..1ddbe55 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -136,6 +136,8 @@ sub add_accounts_to_template { $template->param(%$borrower); + my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'}); + $template->param( picture => 1 ) if $picture; $template->param( accounts => $accounts, borrower => $borrower, @@ -224,10 +226,6 @@ sub borrower_add_additional_fields { } elsif ( $b_ref->{category_type} eq 'A' ) { $b_ref->{adultborrower} = 1; } - my ( $picture, $dberror ) = GetPatronImage( $b_ref->{borrowernumber} ); - if ($picture) { - $b_ref->{has_picture} = 1; - } my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} ); $b_ref->{roadtype} = $roadtype; diff --git a/members/paycollect.pl b/members/paycollect.pl index 35b9121..b71f669 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -175,10 +175,9 @@ sub borrower_add_additional_fields { } elsif ( $b_ref->{category_type} eq 'A' ) { $b_ref->{adultborrower} = 1; } - my ( $picture, $dberror ) = GetPatronImage( $b_ref->{borrowernumber} ); - if ($picture) { - $b_ref->{has_picture} = 1; - } + + my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'}); + $template->param( picture => 1 ) if $picture; if (C4::Context->preference('ExtendedPatronAttributes')) { $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber); -- 1.7.10.4