From 2545af93bef027c485d4a782f2e7f5c28e707116 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 8 Jan 2018 11:15:02 -0300 Subject: [PATCH] Bug 19935: Replace GetPendingIssues - Discharges We should actually use Koha::Patron->checkouts here to avoid the prefetch. Test plan: A patron with checkouts cannot get a discharge --- Koha/Patron/Discharge.pm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Koha/Patron/Discharge.pm b/Koha/Patron/Discharge.pm index a9a6b8d46d..59e2d3bfb9 100644 --- a/Koha/Patron/Discharge.pm +++ b/Koha/Patron/Discharge.pm @@ -6,11 +6,10 @@ use File::Temp qw( :POSIX ); use Carp; use C4::Templates qw ( gettemplate ); -use C4::Members qw( GetPendingIssues ); use Koha::Database; use Koha::DateUtils qw( dt_from_string output_pref ); -use Koha::Patrons; +use Koha::Checkouts; sub count { my ($params) = @_; @@ -35,13 +34,11 @@ sub can_be_discharged { my ($params) = @_; return unless $params->{borrowernumber}; - my $issues = GetPendingIssues( $params->{borrowernumber} ); - if( @$issues ) { - return 0; - } - else { - return 1; - } + my $patron = Koha::Patrons->find( $params->{borrowernumber} ); + return unless $patron; + + my $has_pending_checkouts = $patron->pending_checkouts->count; + return $has_pending_checkouts ? 0 : 1; } sub is_discharged { -- 2.11.0