From f9b25894dd9095f130f8139ae63a5d955759ea5a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 11 Mar 2016 12:47:26 +0000 Subject: [PATCH] Bug 16054: Fix variable scope error in paycollect.pl $borrower, $borrowernumber and $template and not visible in the subroutine. Using $b_ref and passing $template fixes the issue. Test plan: Under plack, use the pay selected button. On the paycollect page, you should see the image of the patron It certainly fixes some other bugs. Signed-off-by: Srdjan Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com (cherry picked from commit da21ad065939d0789bb90d8fd6d088b781688aa3) Signed-off-by: Julian Maurice --- members/paycollect.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/members/paycollect.pl b/members/paycollect.pl index 8a3204000d..8a928f695d 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -140,7 +140,7 @@ if ( $total_paid and $total_paid ne '0.00' ) { $total_paid = '0.00'; #TODO not right with pay_individual } -borrower_add_additional_fields($borrower); +borrower_add_additional_fields($borrower, $template); $template->param(%$borrower); @@ -156,7 +156,7 @@ $template->param( output_html_with_http_headers $input, $cookie, $template->output; sub borrower_add_additional_fields { - my $b_ref = shift; + my ( $b_ref, $template ) = @_; # some borrower info is not returned in the standard call despite being assumed # in a number of templates. It should not be the business of this script but in lieu of @@ -175,11 +175,11 @@ sub borrower_add_additional_fields { $b_ref->{adultborrower} = 1; } - my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'}); + my ($picture, $dberror) = GetPatronImage($b_ref->{'borrowernumber'}); $template->param( picture => 1 ) if $picture; if (C4::Context->preference('ExtendedPatronAttributes')) { - $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber); + $b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber}); } $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} ); -- 2.20.1