Bugzilla – Attachment 179618 Details for
Bug 14250
Don't allow to generate discharges for patrons with fines
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14250: (QA follow-up) Deduplicate checks
Bug-14250-QA-follow-up-Deduplicate-checks.patch (text/plain), 10.80 KB, created by
Baptiste Wojtkowski (bwoj)
on 2025-03-21 14:26:19 UTC
(
hide
)
Description:
Bug 14250: (QA follow-up) Deduplicate checks
Filename:
MIME Type:
Creator:
Baptiste Wojtkowski (bwoj)
Created:
2025-03-21 14:26:19 UTC
Size:
10.80 KB
patch
obsolete
>From 9374ccbb2418aa2f26f69d74c7985a3c56535a92 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 23 Aug 2024 13:40:09 -0400 >Subject: [PATCH] Bug 14250: (QA follow-up) Deduplicate checks > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > Koha/Patron/Discharge.pm | 26 ++++++++++++++----- > .../prog/en/modules/members/discharge.tt | 13 +++++----- > .../bootstrap/en/modules/opac-discharge.tt | 13 +++++----- > members/discharge.pl | 9 +++---- > opac/opac-discharge.pl | 12 ++++++--- > t/db_dependent/Patron/Borrower_Discharge.t | 24 +++++++++++------ > 6 files changed, 58 insertions(+), 39 deletions(-) > >diff --git a/Koha/Patron/Discharge.pm b/Koha/Patron/Discharge.pm >index 01b285fe..7da95ab7 100644 >--- a/Koha/Patron/Discharge.pm >+++ b/Koha/Patron/Discharge.pm >@@ -38,13 +38,22 @@ sub can_be_discharged { > my $patron = Koha::Patrons->find( $params->{borrowernumber} ); > return unless $patron; > >- my $has_pending_checkouts = $patron->checkouts->count; >- return 0 if $has_pending_checkouts; >+ my $can_be_discharged = 1; >+ my $problems = {}; > >- my $has_debt = ( $patron->account->outstanding_debits->total_outstanding > 0 ); >- return 0 if $has_debt; >+ my $checkouts = $patron->checkouts->count; >+ if ($checkouts) { >+ $can_be_discharged = 0; >+ $problems->{checkouts} = $checkouts; >+ } >+ >+ my $debt = $patron->account->outstanding_debits->total_outstanding; >+ if ( $debt > 0 ) { >+ $can_be_discharged = 0; >+ $problems->{debt} = $debt; >+ } > >- return 1; >+ return ( $can_be_discharged, $problems ); > } > > sub is_discharged { >@@ -66,7 +75,8 @@ sub request { > my ($params) = @_; > my $borrowernumber = $params->{borrowernumber}; > return unless $borrowernumber; >- return unless can_be_discharged( { borrowernumber => $borrowernumber } ); >+ my ($can) = can_be_discharged( { borrowernumber => $borrowernumber } ); >+ return unless $can; > > my $rs = Koha::Database->new->schema->resultset('Discharge'); > return $rs->create( >@@ -80,7 +90,9 @@ sub request { > sub discharge { > my ($params) = @_; > my $borrowernumber = $params->{borrowernumber}; >- return unless $borrowernumber and can_be_discharged( { borrowernumber => $borrowernumber } ); >+ >+ my ($can) = can_be_discharged( { borrowernumber => $borrowernumber } ); >+ return unless $borrowernumber and $can; > > # Cancel reserves > my $patron = Koha::Patrons->find($borrowernumber); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >index 01a1c003..63bfb6a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt >@@ -2,6 +2,7 @@ > [% USE Koha %] > [% USE Asset %] > [% USE KohaDates %] >+[% USE Price %] > [% USE AuthorisedValues %] > [% USE Branches %] > [% PROCESS 'i18n.inc' %] >@@ -54,14 +55,12 @@ > [% UNLESS can_be_discharged %] > <p>Cannot edit discharge for following reasons: </p> > <ul> >- [% IF patron.checkouts.count %] >- <li>They have checked out items</li> >+ [% IF discharge_problems.checkouts %] >+ <li>They have [% discharge_problems.checkouts | html %] item(s) checked out</li> > [% END %] >- [% IF (patron.account.outstanding_debits.total_outstanding > 0) %] >- <li>They have unpaid fines</li> >- [% END %] >- [% IF patron.checkouts.count == 0 and (patron.account.outstanding_debits.total_outstanding == 0) %] >- <li> Patron cannot be discharged for an unknown reason, please contact a librarian for more information</li> >+ >+ [% IF discharge_problems.debt %] >+ <li>They have unpaid fines totaling [% discharge_problems.debt | $Price %]</li> > [% END %] > </ul> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >index 3578e1d2..c28ab0e0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt >@@ -1,5 +1,6 @@ > [% USE raw %] > [% USE Koha %] >+[% USE Price %] > [% USE AdditionalContents %] > [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] > [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %] >@@ -65,14 +66,12 @@ > <div class="alert alert-info" > >You cannot be discharged for following reasons: > <ul> >- [% IF has_debt %] >- <li> You have unpaid fines. Please pay your fines before reapplying.</li> >+ [% IF discharge_problems.checkouts %] >+ <li> You have [% discharge_problems.checkouts | html %] item(s) checked out. Please return them before reapplying. </li> > [% END %] >- [% IF has_checkouts %] >- <li> You have checked out items. Please return them before reapplying.</li> >- [% END %] >- [% IF !has_checkouts and !has_debt %] >- <li> Patron cannot be discharged for an unknown reason, please contact a librarian for more information</li> >+ >+ [% IF discharge_problems.debt %] >+ <li> They have unpaid fines totaling [% discharge_problems.debt | $Price %]. Please pay your fines before reapplying. </li> > [% END %] > </ul> > </div> >diff --git a/members/discharge.pl b/members/discharge.pl >index e55ed6b0..b4dda3a1 100755 >--- a/members/discharge.pl >+++ b/members/discharge.pl >@@ -65,12 +65,8 @@ output_and_exit_if_error( > { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } > ); > >-my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $borrowernumber } ); >- >-unless ($can_be_discharged) { >- my $has_checkout = $patron->checkouts->count; >- my $has_fine = $patron->account->outstanding_debits->total_outstanding; >-} >+my ( $can_be_discharged, $discharge_problems ) = >+ Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $borrowernumber } ); > > # Generating discharge if needed > if ( $op eq 'cud-discharge' && $input->param('discharge') and $can_be_discharged ) { >@@ -117,6 +113,7 @@ my @validated_discharges = Koha::Patron::Discharge::get_validated( > $template->param( > patron => $patron, > can_be_discharged => $can_be_discharged, >+ discharge_problems => $discharge_problems, > validated_discharges => \@validated_discharges, > ); > >diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl >index 76d535b3..54fc526d 100755 >--- a/opac/opac-discharge.pl >+++ b/opac/opac-discharge.pl >@@ -45,14 +45,18 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >-my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $loggedinuser } ); >+my ( $can_be_discharged, $discharge_problems ) = >+ Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $loggedinuser } ); > my $patron = Koha::Patrons->find($loggedinuser); > my $has_pending_checkouts = $patron->checkouts->count; > my $has_debt = ( $patron->account->outstanding_debits->total_outstanding > 0 ); > >-$template->param( can_be_discharged => $can_be_discharged ); >-$template->param( has_checkouts => $has_pending_checkouts ); >-$template->param( has_debt => $has_debt ); >+$template->param( >+ can_be_discharged => $can_be_discharged, >+ discharge_problems => $discharge_problems, >+ has_checkouts => $has_pending_checkouts, >+ has_debt => $has_debt, >+); > > my $pending = Koha::Patron::Discharge::count( > { >diff --git a/t/db_dependent/Patron/Borrower_Discharge.t b/t/db_dependent/Patron/Borrower_Discharge.t >index 86d14b9e..869ccc18 100755 >--- a/t/db_dependent/Patron/Borrower_Discharge.t >+++ b/t/db_dependent/Patron/Borrower_Discharge.t >@@ -16,7 +16,7 @@ > > use Modern::Perl; > >-use Test::More tests => 25; >+use Test::More tests => 32; > > use Test::MockModule; > use Test::Warn; >@@ -89,10 +89,10 @@ $builder->build_sample_item( > ); > > AddIssue( $patron, $barcode ); >-is( >- Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ), 0, >- 'A patron with issues cannot be discharged' >-); >+my ( $can, $problems ) = Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ); >+is( $can, 0, 'A patron with issues cannot be discharged' ); >+is( $problems->{checkouts}, 1, "Patron has checkouts" ); >+is( $problems->{debt}, undef, "Patron has no debt" ); > > is( > Koha::Patron::Discharge::request( { borrowernumber => $patron->borrowernumber } ), undef, >@@ -114,17 +114,23 @@ $patron->account->add_debit( > } > ); > >+( $can, $problems ) = Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ); > is( >- Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ), 0, >+ $can, 0, > 'A patron with fines and checkouts cannot be discharged' > ); >+is( $problems->{checkouts}, 1, "Patron has checkouts" ); >+is( $problems->{debt}, 0.1, "Patron has debt" ); > > AddReturn($barcode); > >+( $can, $problems ) = Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ); > is( >- Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ), 0, >+ $can, 0, > 'A patron with fines cannot be discharged' > ); >+is( $problems->{checkouts}, undef, "Patron has checkouts" ); >+is( $problems->{debt}, 0.1, "Patron has debt" ); > > $patron->account->pay( > { >@@ -133,10 +139,12 @@ $patron->account->pay( > ); > > # Discharge possible without issue or fine >+( $can, $problems ) = Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ); > is( >- Koha::Patron::Discharge::can_be_discharged( { borrowernumber => $patron->borrowernumber } ), 1, >+ $can, 1, > 'A patron without issues or fines can be discharged' > ); >+is( scalar keys %$problems, 0, "No dishcharge problems found" ); > > is( Koha::Patron::Discharge::generate_as_pdf, undef, "Confirm failure when lacking borrower number" ); > >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14250
:
170136
|
170228
|
170581
|
170607
|
170662
|
170663
|
170664
|
170705
|
170706
|
170707
|
170708
|
171025
|
171026
|
171271
|
171272
|
171273
|
171274
|
171275
|
171276
|
179617
| 179618 |
179619
|
179620
|
179621
|
179622