@@ -, +, @@
expired subscriptions
"Subscription will expire [ date in the past ]."
---
.../intranet-tmpl/prog/en/modules/serials/subscription-detail.tt | 6 ++++--
serials/subscription-detail.pl | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -33,8 +33,10 @@
Subscription for [% bibliotitle | html %] [% IF closed %](closed)[% END %]
- [% IF ( abouttoexpire ) %]
- [% UNLESS closed %]
+ [% IF abouttoexpire AND NOT closed %]
+ [% IF has_expired_already %]
+
+ [% ELSE %]
[% END %]
[% END %]
--- a/serials/subscription-detail.pl
+++ a/serials/subscription-detail.pl
@@ -120,6 +120,7 @@ for my $date ( qw(startdate enddate firstacquidate histstartdate histenddate) )
my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $subs->{location} });
$subs->{location} = $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};
--