From 5995275b74777432c5ac3b26bf5016e6a27cfcf5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 28 Jun 2018 11:00:57 -0300 Subject: [PATCH] Bug 21008: Use Koha::Patron->is_child Signed-off-by: Tomas Cohen Arazi Edit: I removed the category parameter as it is not really used. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- members/pay.pl | 2 +- members/paycollect.pl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/members/pay.pl b/members/pay.pl index e01fbdabee..2f967b34a3 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -234,7 +234,7 @@ sub borrower_add_additional_fields { # 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 # a revised api here it is ... - if ( $patron->category->category_type eq 'C' ) { + if ( $patron->is_child ) { my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']}); $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1; $template->param( 'catcode' => $patron_categories->next->categorycode ) if $patron_categories->count == 1; diff --git a/members/paycollect.pl b/members/paycollect.pl index 3853289398..0c547fe12b 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -180,7 +180,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, $template, $category); +borrower_add_additional_fields($patron, $template); $template->param(%$borrower); @@ -201,19 +201,19 @@ $template->param( output_html_with_http_headers $input, $cookie, $template->output; sub borrower_add_additional_fields { - my ( $b_ref, $template, $category ) = @_; + my ( $patron, $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 # a revised api here it is ... - if ( $category->category_type eq 'C' ) { + if ( $patron->is_child ) { my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']}); $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1; $template->param( 'catcode' => $patron_categories->next->categorycode ) if $patron_categories->count == 1; } if (C4::Context->preference('ExtendedPatronAttributes')) { - my $extendedattributes = GetBorrowerAttributes($b_ref->{borrowernumber}); + my $extendedattributes = GetBorrowerAttributes($patron->borrowernumber); $template->param( extendedattributes => $extendedattributes ); } -- 2.39.5