@@ -, +, @@
expired subscriptions
"Subscription will expire [ date in the past ]."
---
.../prog/en/modules/serials/subscription-detail.tt | 6 ++++--
serials/subscription-detail.pl | 3 ++-
2 files changed, 6 insertions(+), 3 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
@@ -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 %]
+
+ [% ELSE %]
[% END %]
[% END %]
--- a/serials/subscription-detail.pl
+++ a/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};
--