Attachment 70354 Details for Bug 19935 – Bug 19935: Replace GetPendingIssues - Discharges

[patch] Bug 19935: Replace GetPendingIssues - Discharges

Bug-19935-Replace-GetPendingIssues---Discharges.patch (text/plain), 1.42 KB, created by Jonathan Druart on 2018-01-09 14:31:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-01-09 14:31:26 UTC

Size: 1.42 KB

patch

obsolete

>From 2545af93bef027c485d4a782f2e7f5c28e707116 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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

Actions: View | Diff | Splinter Review

Attachments on bug 19935: 70351 | 70352 | 70353 | 70354 | 70355 | 70356 | 70357 | 70358 | 70359 | 70360 | 70361 | 71807 | 71808 | 71809 | 71810 | 71811 | 71812 | 71813 | 72752 | 72753 | 72754 | 72755 | 72756 | 72757 | 72758 | 72759 | 72760 | 72761 | 72762 | 73557 | 73558 | 73559 | 73560 | 73561 | 73562 | 73563 | 73564 | 73565 | 73566 | 73567 | 73568 | 73569 | 73570 | 73571 | 73572 | 73573 | 73574 | 73575 | 73576 | 73577 | 73578 | 73579 | 73580 | 73581 | 73582