From dab95fae91648e3453f513cfbd4411dd072122d3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 15 Jan 2019 14:53:07 +0000 Subject: [PATCH] Bug 22134: Add account expiration information to patron details This patch modifies the patron detail template in the staff client so that when a patron's registration is expired a message shows at the top of the page along with the same "Renew" and "Edit" links which appear on the checkout page. Links are also shown next the the expiration date in the body of the page. This patch also corrects the capitalization of the "Edit Details" link on circulation.tt. To test, apply the patch and locate a patron record which is expired. - On the patron detail page (members/moremember.pl) you should see a message at the top of the page. - In the body of the page, next to the expiration date information, you should see similar message and links. - On the patron's checkout page the "Edit details" link in the expiration message should have correct capitalization. Signed-off-by: Devinim Signed-off-by: Maryse Simard --- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 17 +++++++++++++++++ members/moremember.pl | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 3c5a777..12b0548 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -656,7 +656,7 @@ No patron matched [% message | html %] [% IF ( warndeparture ) %]
  • Expiration: Patron's card will expire soon. - Patron's card expires on [% expiry | $KohaDates %] Renew or Edit Details + Patron's card expires on [% expiry | $KohaDates %] Renew or Edit details
    • [% END %] @@ -669,7 +669,7 @@ No patron matched [% message | html %] [% IF ( expired ) %]
  • Expiration: Patron's card has expired. - [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] Renew or Edit Details + [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] Renew or Edit details
    • [% END %] 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 6e15e3c..85fe62f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -133,6 +133,17 @@ [% IF ( lost ) %]
  • Patron's card has been reported lost.
    • [% END %] + [% IF ( expired ) %] +
  • + Expiration: + [% IF ( patron.dateexpiry ) %] + Patron's card expired on [% patron.dateexpiry | $KohaDates %]. + [% ELSE %] + Patron's card has expired. + [% END %] + Renew or Edit details +
    • + [% END %] [% END %] @@ -428,6 +439,12 @@ Expiration date: [% IF ( was_renewed ) %] [% patron.dateexpiry | $KohaDates %] + [% ELSIF ( expired ) %] + + [% patron.dateexpiry | $KohaDates %] + Expired + Renew or Edit details + [% ELSE %] [% patron.dateexpiry | $KohaDates %] [% END %] diff --git a/members/moremember.pl b/members/moremember.pl index 9f06882..e76dcd0 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -308,6 +308,22 @@ if( $patron_messages->count > 0 ){ 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 ) { + $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 + ); +} + my $total = $patron->account->balance; $template->param( patron => $patron, -- 2.7.4