From abfdfc59de6ccee5512c66d8bdb813adce1d11a9 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@iki.fi>
Date: Sun, 26 Sep 2021 16:09:20 +0000
Subject: [PATCH] Bug 29116: Use a pre-existing accessor instead of
 reimplementing it
Content-Type: text/plain; charset=utf-8

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 <fridolin.somers@biblibre.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 .../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 @@
                     </div>
                 [% 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') ) ) %]
                     <div class="dialog message">
                         <ul>
-                            [% IF ( expiry ) %]
+                            [% IF ( patron.is_expired ) %]
                                 <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li>
                             [% END %]
 
@@ -405,7 +405,7 @@
                             [% END %]
                         </ul> <!-- /.dialog.message -->
                     </div>
-                [% END # /IF expiry || diffbranch ... %]
+                [% END # /IF patron.is_expired || diffbranch ... %]
 
                 [% IF ( messageborrower ) %]
                     <div class="dialog alert">
diff --git a/reserve/request.pl b/reserve/request.pl
index 95a7fd43d1..a66303b2c5 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.20.1