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 52-59 Link Here
52
52
53
                <h1>Subscription for [% bibliotitle | html %] [% bibliosubtitle | html %] [% IF closed %](closed)[% END %]</h1>
53
                <h1>Subscription for [% bibliotitle | html %] [% bibliosubtitle | html %] [% IF closed %](closed)[% END %]</h1>
54
54
55
                [% IF ( abouttoexpire ) %]
55
                [% IF abouttoexpire AND NOT closed %]
56
                    [% UNLESS closed %]
56
                    [% IF has_expired_already %]
57
                        <div class="dialog message">Subscription expired on [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
58
                    [% ELSE %]
57
                        <div class="dialog message">Subscription will expire [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
59
                        <div class="dialog message">Subscription will expire [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
58
                    [% END %]
60
                    [% END %]
59
                [% END %]
61
                [% END %]
(-)a/serials/subscription-detail.pl (-2 / +2 lines)
Lines 25-31 use C4::Search qw( enabled_staff_search_views ); Link Here
25
25
26
use Koha::AdditionalFields;
26
use Koha::AdditionalFields;
27
use Koha::AuthorisedValues;
27
use Koha::AuthorisedValues;
28
use Koha::DateUtils qw( output_pref );
28
use Koha::DateUtils qw( output_pref dt_from_string );
29
use Koha::Acquisition::Bookseller;
29
use Koha::Acquisition::Bookseller;
30
use Koha::Subscriptions;
30
use Koha::Subscriptions;
31
31
Lines 117-122 $subs->{location} = $av->count ? $av->next->lib : ''; Link Here
117
$av = Koha::AuthorisedValues->search({ category => 'CCODE', authorised_value => $subs->{ccode} });
117
$av = Koha::AuthorisedValues->search({ category => 'CCODE', authorised_value => $subs->{ccode} });
118
$subs->{ccode} = $av->count ? $av->next->lib : '';
118
$subs->{ccode} = $av->count ? $av->next->lib : '';
119
$subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
119
$subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
120
$subs->{has_expired_already}  = dt_from_string($subs->{enddate})->compare(dt_from_string);
120
$template->param(%{ $subs });
121
$template->param(%{ $subs });
121
$template->param(biblionumber_for_new_subscription => $subs->{bibnum});
122
$template->param(biblionumber_for_new_subscription => $subs->{bibnum});
122
my @irregular_issues = split /;/, $subs->{irregularity};
123
my @irregular_issues = split /;/, $subs->{irregularity};
123
- 

Return to bug 8694