@@ -, +, @@
expired subscriptions
---
.../prog/en/modules/serials/subscription-detail.tt | 8 +++++++-
serials/subscription-detail.pl | 7 ++++++-
2 files changed, 13 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
@@ -56,7 +56,13 @@ $(document).ready(function() {
[% INCLUDE 'serials-toolbar.inc' %]
Subscription for [% bibliotitle %]
- [% IF ( abouttoexpire ) %][% END %]
+ [% IF ( abouttoexpire ) %]
+ [% IF ( expired ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ [% END %]
[% IF ( NEEDSCONFIRMATION ) %]
Please Confirm Subscription deletion
--- a/serials/subscription-detail.pl
+++ a/serials/subscription-detail.pl
@@ -25,7 +25,7 @@ use C4::Serials;
use C4::Output;
use C4::Context;
use C4::Search qw/enabled_staff_search_views/;
-use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
+use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days Delta_Days/;
use Carp;
my $query = new CGI;
@@ -99,10 +99,15 @@ my $hasRouting = check_routing($subscriptionid);
= checkauth($query, 0, {catalogue => 1}, "intranet");
# COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
+my $today = C4::Dates->today("iso");
+my $expirationdiff = Delta_Days(split(/-/,"$subs->{enddate}"),split (/-/,$today)) ;
+
+if($expirationdiff >= 0){ $subs->{expired} = 1; }
for my $date qw(startdate enddate firstacquidate histstartdate histenddate){
$$subs{$date} = format_date($$subs{$date}) if $date && $$subs{$date};
}
+
$subs->{location} = GetKohaAuthorisedValueLib("LOC",$subs->{location});
$subs->{abouttoexpire} = abouttoexpire($subs->{subscriptionid});
$template->param(%{ $subs });
--