Bug 22134: (follow-up) Simplify check for expired patron

[koha.git] / members / moremember.pl

diff --git a/members/moremember.pl b/members/moremember.pl
index e76dcd0..faaa95e 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -309,17 +309,8 @@ my ( $subtag, $region ) = split '-', $patron->lang;
 my $translated_language = C4::Languages::language_get_description( $subtag, $subtag, 'language' );
 
 # if the expiry date is before today ie they have expired
-if ( $patron->is_expired ) {
+if ( $patron->is_expired || $patron->is_going_to_expire ) {
     $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
     );
 }