From 283b6b0c067da0117628bda6b5d8f97ec9581517 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joonas=20Kylm=C3=A4l=C3=A4?= Date: Sun, 26 Sep 2021 16:09:20 +0000 Subject: [PATCH] Bug 29116: Use a pre-existing accessor instead of reimplementing it We can use the Koha::Patron::is_expired accessor instead of re-writing it in request.pl. To test: 1) Make that a warning is being shown with and without this patch when placing a hold to an expired patron account Signed-off-by: Fridolin Somers Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/modules/reserve/request.tt | 6 +++--- reserve/request.pl | 9 --------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 14cc35a319..8e9bf1fd4f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -385,10 +385,10 @@ [% END # /IF ( exceeded_maxreserves || ... %] - [% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %] + [% IF ( patron.is_expired || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
- [% END # /IF expiry || diffbranch ... %] + [% END # /IF patron.is_expired || diffbranch ... %] [% IF ( messageborrower ) %]
diff --git a/reserve/request.pl b/reserve/request.pl index 69212a3ced..10fa575f11 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -226,14 +226,6 @@ if ($borrowernumber_hold && !$action) { ); } - # we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn) - my $expiry_date = $patron->dateexpiry; - my $expiry = 0; # flag set if patron account has expired - if ($expiry_date and - Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) { - $expiry = 1; - } - # check if the borrower make the reserv in a different branch if ( $patron->branchcode ne C4::Context->userenv->{'branch'} ) { $diffbranch = 1; @@ -242,7 +234,6 @@ if ($borrowernumber_hold && !$action) { my $amount_outstanding = $patron->account->balance; $template->param( patron => $patron, - expiry => $expiry, diffbranch => $diffbranch, messages => $messages, warnings => $warnings, -- 2.39.5