From a3b1e7df0bc7d49a50a7d9030a5de64ce93de22d Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Thu, 17 Jan 2019 16:27:43 +0000 Subject: [PATCH] Bug 22134: (follow-up) Simplify check for expired patron This patch move the check for "is_expired" to the template and removes unnecessary code from the script. The interface should show no difference. Signed-off-by: Jack Kelliher <jke0429@stacmail.net> --- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- members/moremember.pl | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 677bf45917..9a8c47a9ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -133,7 +133,7 @@ [% IF ( lost ) %] <li class="blocker">Patron's card has been reported lost.</li> [% END %] - [% IF ( expired ) %] + [% IF ( patron.is_expired ) %] <li class="blocker"> <span class="circ-hlt">Expiration:</span> [% IF ( patron.dateexpiry ) %] @@ -439,7 +439,7 @@ <span class="label">Expiration date: </span> [% IF ( was_renewed ) %] <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong> - [% ELSIF ( expired ) %] + [% ELSIF ( patron.is_expired ) %] <span class="blocker"> [% patron.dateexpiry | $KohaDates %] <strong><em>Expired</em></strong> diff --git a/members/moremember.pl b/members/moremember.pl index e76dcd019b..637ea9f812 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -311,15 +311,6 @@ my $translated_language = C4::Languages::language_get_description( $subtag, $sub # if the expiry date is before today ie they have expired if ( $patron->is_expired ) { $template->param( - expired => "1", - flagged => 1 - ); -} -# check for NotifyBorrowerDeparture -elsif ( $patron->is_going_to_expire ) { - # borrower card soon to expire warn librarian - $template->param( - "warndeparture" => $patron->dateexpiry, flagged => 1 ); } -- 2.11.0