View | Details | Raw Unified | Return to bug 8694
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +4 lines)
Lines 33-40 Link Here
33
33
34
                <h1>Subscription for [% bibliotitle | html %] [% IF closed %](closed)[% END %]</h1>
34
                <h1>Subscription for [% bibliotitle | html %] [% IF closed %](closed)[% END %]</h1>
35
35
36
                [% IF ( abouttoexpire ) %]
36
                [% IF abouttoexpire AND NOT closed %]
37
                    [% UNLESS closed %]
37
                    [% IF has_expired_already %]
38
                        <div class="dialog message">Subscription expired on [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
39
                    [% ELSE %]
38
                        <div class="dialog message">Subscription will expire [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
40
                        <div class="dialog message">Subscription will expire [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
39
                    [% END %]
41
                    [% END %]
40
                [% END %]
42
                [% END %]
(-)a/serials/subscription-detail.pl (-1 / +1 lines)
Lines 120-125 for my $date ( qw(startdate enddate firstacquidate histstartdate histenddate) ) Link Here
120
my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $subs->{location} });
120
my $av = Koha::AuthorisedValues->search({ category => 'LOC', authorised_value => $subs->{location} });
121
$subs->{location} = $av->count ? $av->next->lib : '';
121
$subs->{location} = $av->count ? $av->next->lib : '';
122
$subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
122
$subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
123
$subs->{has_expired_already}  = dt_from_string($subs->{enddate})->compare(dt_from_string);
123
$template->param(%{ $subs });
124
$template->param(%{ $subs });
124
$template->param(biblionumber_for_new_subscription => $subs->{bibnum});
125
$template->param(biblionumber_for_new_subscription => $subs->{bibnum});
125
my @irregular_issues = split /;/, $subs->{irregularity};
126
my @irregular_issues = split /;/, $subs->{irregularity};
126
- 

Return to bug 8694