From fc2c2a0cbd68535d231d7103a4f8995a05f5b890 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 8 Nov 2016 12:26:00 +0100 Subject: [PATCH] Bug 17583: Use Koha::Patron->is_expired from the circulation page Content-Type: text/plain; charset=utf-8 Bug 17579 introduces a Koha::Patron->is_expired method. Let's use it from this script. Test plan: Confirm that you see the message on the interface from the circulation page for an expired patron Signed-off-by: Josef Moravec Signed-off-by: Marcel de Rooy --- circ/circulation.pl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 9a376a1..6efcbe6 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -268,15 +268,8 @@ if ($borrowernumber) { $borrower = GetMemberDetails( $borrowernumber, 0 ); my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber ); - # Warningdate is the date that the warning starts appearing - my ( $today_year, $today_month, $today_day) = Today(); - my ($warning_year, $warning_month, $warning_day) = split /-/, $borrower->{'dateexpiry'}; - my ( $enrol_year, $enrol_month, $enrol_day) = split /-/, $borrower->{'dateenrolled'}; # if the expiry date is before today ie they have expired - if ( !$borrower->{'dateexpiry'} || $warning_year*$warning_month*$warning_day==0 - || Date_to_Days($today_year, $today_month, $today_day ) - > Date_to_Days($warning_year, $warning_month, $warning_day) ) - { + if ( $patron->is_expired ) { #borrowercard expired, no issues $template->param( noissues => ($force_allow_issue) ? 0 : "1", -- 2.1.4