From 4b6693ee012046d527c4619d45430a662bde5728 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 16 Dec 2020 14:42:03 +0100 Subject: [PATCH] Bug 8694: Show accurate subscription renewal warning for expired subscriptions If a subscription is going to expired we should not phrase the warning "Subscription will expire [ date in the past ]." Test plan: Create a subscription with relevant expiration date. The detail page of the subscription show correctly the warning about the expiration date. Signed-off-by: Sally --- .../prog/en/modules/serials/subscription-detail.tt | 6 ++++-- serials/subscription-detail.pl | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index f6f4b3fe5ae..c379e2ce6bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -52,8 +52,10 @@

Subscription for [% bibliotitle | html %] [% bibliosubtitle | html %] [% IF closed %](closed)[% END %]

- [% IF ( abouttoexpire ) %] - [% UNLESS closed %] + [% IF abouttoexpire AND NOT closed %] + [% IF has_expired_already %] +
Subscription expired on [% enddate | html %]. Renew this subscription.
+ [% ELSE %]
Subscription will expire [% enddate | html %]. Renew this subscription.
[% END %] [% END %] diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 2ae5cd3ef74..373ab62d663 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -25,7 +25,7 @@ use C4::Search qw( enabled_staff_search_views ); use Koha::AdditionalFields; use Koha::AuthorisedValues; -use Koha::DateUtils qw( output_pref ); +use Koha::DateUtils qw( output_pref dt_from_string ); use Koha::Acquisition::Bookseller; use Koha::Subscriptions; @@ -117,6 +117,7 @@ $subs->{location} = $av->count ? $av->next->lib : ''; $av = Koha::AuthorisedValues->search({ category => 'CCODE', authorised_value => $subs->{ccode} }); $subs->{ccode} = $av->count ? $av->next->lib : ''; $subs->{abouttoexpire} = abouttoexpire($subs->{subscriptionid}); +$subs->{has_expired_already} = dt_from_string($subs->{enddate})->compare(dt_from_string); $template->param(%{ $subs }); $template->param(biblionumber_for_new_subscription => $subs->{bibnum}); my @irregular_issues = split /;/, $subs->{irregularity}; -- 2.25.1