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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-3 / +3 lines)
Lines 50-63 Link Here
50
        [% END %]
50
        [% END %]
51
51
52
        [% IF not cannotedit or CAN_user_serials_receive_serials %]
52
        [% IF not cannotedit or CAN_user_serials_receive_serials %]
53
            [% IF CAN_user_serials_renew_subscription and not closed %]
53
            [% IF CAN_user_serials_renew_subscription and not subscription.closed %]
54
                <div class="btn-group"><a id="renew" class="btn btn-default" href="#"><i class="fa fa-refresh"></i> Renew</a></div>
54
                <div class="btn-group"><a id="renew" class="btn btn-default" href="#"><i class="fa fa-refresh"></i> Renew</a></div>
55
            [% END %]
55
            [% END %]
56
            [% IF CAN_user_serials_receive_serials and not closed %]
56
            [% IF CAN_user_serials_receive_serials and not subscription.closed %]
57
                <div class="btn-group"><a id="receive" class="btn btn-default" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid | html %]&amp;serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div>
57
                <div class="btn-group"><a id="receive" class="btn btn-default" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid | html %]&amp;serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div>
58
            [% END %]
58
            [% END %]
59
            [% UNLESS cannotedit %]
59
            [% UNLESS cannotedit %]
60
                [% IF closed %]
60
                [% IF subscription.closed %]
61
                    <div class="btn-group"><a id="reopen" class="btn btn-default" href="#"><i class="fa fa-repeat"></i> Reopen</a></div>
61
                    <div class="btn-group"><a id="reopen" class="btn btn-default" href="#"><i class="fa fa-repeat"></i> Reopen</a></div>
62
                [% ELSE %]
62
                [% ELSE %]
63
                    <div class="btn-group"><a id="close" class="btn btn-default" href="#"><i class="fa fa-times-circle"></i> Close</a></div>
63
                    <div class="btn-group"><a id="close" class="btn btn-default" href="#"><i class="fa fa-times-circle"></i> Close</a></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +2 lines)
Lines 42-51 Link Here
42
                [% INCLUDE 'serials-toolbar.inc' %]
42
                [% INCLUDE 'serials-toolbar.inc' %]
43
                [% INCLUDE 'mana/mana-comment-status.inc' %]
43
                [% INCLUDE 'mana/mana-comment-status.inc' %]
44
44
45
                <h1>Subscription for [% bibliotitle | html %] [% bibliosubtitle | html %] [% IF closed %](closed)[% END %]</h1>
45
                <h1>Subscription for [% bibliotitle | html %] [% bibliosubtitle | html %] [% IF subscription.closed %](closed)[% END %]</h1>
46
46
47
                [% IF ( abouttoexpire ) %]
47
                [% IF ( abouttoexpire ) %]
48
                    [% UNLESS closed %]
48
                    [% UNLESS subscription.closed %]
49
                        <div class="dialog message">Subscription will expire [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
49
                        <div class="dialog message">Subscription will expire [% enddate | html %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
50
                    [% END %]
50
                    [% END %]
51
                [% END %]
51
                [% END %]
(-)a/serials/subscription-detail.pl (-3 lines)
Lines 62-69 $subs->{enddate} ||= GetExpirationDate($subscriptionid); Link Here
62
my ($totalissues,@serialslist) = GetSerials($subscriptionid);
62
my ($totalissues,@serialslist) = GetSerials($subscriptionid);
63
$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
63
$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
64
64
65
my $subscription = Koha::Subscriptions->find( $subscriptionid );
66
67
if ( $op and $op eq "close" ) {
65
if ( $op and $op eq "close" ) {
68
    C4::Serials::CloseSubscription( $subscriptionid );
66
    C4::Serials::CloseSubscription( $subscriptionid );
69
} elsif ( $op and $op eq "reopen" ) {
67
} elsif ( $op and $op eq "reopen" ) {
70
- 

Return to bug 37247