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

(-)a/C4/Circulation.pm (-2 / +22 lines)
Lines 3357-3362 sub AddRenewal { Link Here
3357
    my $seen              = $params->{seen};
3357
    my $seen              = $params->{seen};
3358
    my $automatic         = $params->{automatic};
3358
    my $automatic         = $params->{automatic};
3359
    my $skip_record_index = $params->{skip_record_index};
3359
    my $skip_record_index = $params->{skip_record_index};
3360
    my $confirmations     = $params->{confirmations};
3361
    my $forced            = $params->{forced};
3360
3362
3361
    # Fallback on a 'seen' renewal
3363
    # Fallback on a 'seen' renewal
3362
    $seen = defined $seen && $seen == 0 ? 0 : 1;
3364
    $seen = defined $seen && $seen == 0 ? 0 : 1;
Lines 3430-3439 sub AddRenewal { Link Here
3430
                );
3432
                );
3431
                if ( !$seen && $rule && looks_like_number( $rule->rule_value ) ) {
3433
                if ( !$seen && $rule && looks_like_number( $rule->rule_value ) ) {
3432
                    $unseen_renewals++;
3434
                    $unseen_renewals++;
3435
                    push @{$confirmations}, 'UNSEEN';
3433
                } else {
3436
                } else {
3434
3437
3435
                    # If the renewal is seen, unseen should revert to 0
3438
                    # If the renewal is seen, unseen should revert to 0
3436
                    $unseen_renewals = 0;
3439
                    $unseen_renewals = 0;
3440
                    push @{$confirmations}, 'SEEN';
3437
                }
3441
                }
3438
            }
3442
            }
3439
3443
Lines 3541-3548 sub AddRenewal { Link Here
3541
            $patron->update_lastseen('renewal');
3545
            $patron->update_lastseen('renewal');
3542
3546
3543
            #Log the renewal
3547
            #Log the renewal
3544
            logaction( "CIRCULATION", "RENEWAL", $borrowernumber, $itemnumber )
3548
            if ( C4::Context->preference("RenewalLog") ) {
3545
                if C4::Context->preference("RenewalLog");
3549
                my $info = $itemnumber;
3550
                if ( defined($confirmations) || defined($forced) ) {
3551
                    $info = to_json(
3552
                        {
3553
                            issue         => $issue->issue_id,
3554
                            itemnumber    => $itemnumber,
3555
                            confirmations => $confirmations,
3556
                            forced        => $forced
3557
                        },
3558
                        {
3559
                            pretty    => 1,
3560
                            cononical => 1
3561
                        }
3562
                    );
3563
                }
3564
                logaction( "CIRCULATION", "RENEWAL", $borrowernumber, $info );
3565
            }
3546
3566
3547
            Koha::Plugins->call(
3567
            Koha::Plugins->call(
3548
                'after_circ_action',
3568
                'after_circ_action',
(-)a/circ/renew.pl (-4 / +7 lines)
Lines 66-74 if ( $op eq 'cud-renew' && $barcode ) { Link Here
66
            $patron = $checkout->patron;
66
            $patron = $checkout->patron;
67
67
68
            if ( ( $patron->is_debarred || q{} ) lt dt_from_string()->ymd() ) {
68
            if ( ( $patron->is_debarred || q{} ) lt dt_from_string()->ymd() ) {
69
                my $confirmations;
69
                my $can_renew;
70
                my $can_renew;
70
                my $info;
71
                my $info;
71
                ( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit );
72
                ( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit );
73
                push @{$confirmations}, $override_limit if $override_limit;
72
74
73
                if ( $error && ( $error eq 'on_reserve' ) ) {
75
                if ( $error && ( $error eq 'on_reserve' ) ) {
74
                    if ($override_holds) {
76
                    if ($override_holds) {
Lines 97-106 if ( $op eq 'cud-renew' && $barcode ) { Link Here
97
99
98
                    $date_due = AddRenewal(
100
                    $date_due = AddRenewal(
99
                        {
101
                        {
100
                            itemnumber => $item->itemnumber(),
102
                            itemnumber    => $item->itemnumber(),
101
                            branch     => $branchcode,
103
                            branch        => $branchcode,
102
                            datedue    => $date_due,
104
                            datedue       => $date_due,
103
                            seen       => !$unseen
105
                            seen          => !$unseen,
106
                            confirmations => $confirmations
104
                        }
107
                        }
105
                    );
108
                    );
106
                    $template->param( date_due => $date_due );
109
                    $template->param( date_due => $date_due );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-9 / +9 lines)
Lines 59-65 Link Here
59
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
59
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
60
                        [% INCLUDE 'csrf-token.inc' %]
60
                        [% INCLUDE 'csrf-token.inc' %]
61
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
61
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
62
                        <input type="hidden" name="override_limit" value="1" />
62
                        <input type="hidden" name="override_limit" value="RENEWAL_LIMIT" />
63
                        <input type="hidden" name="op" value="cud-renew" />
63
                        <input type="hidden" name="op" value="cud-renew" />
64
                        <input type="hidden" name="hard_due_date" value="[% hard_due_date | html %]" />
64
                        <input type="hidden" name="hard_due_date" value="[% hard_due_date | html %]" />
65
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override limit and renew</button>
65
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override limit and renew</button>
Lines 72-78 Link Here
72
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
72
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
73
                        [% INCLUDE 'csrf-token.inc' %]
73
                        [% INCLUDE 'csrf-token.inc' %]
74
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
74
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
75
                        <input type="hidden" name="override_limit" value="1" />
75
                        <input type="hidden" name="override_limit" value="UNSEEN_LIMIT" />
76
                        <input type="hidden" name="op" value="cud-renew" />
76
                        <input type="hidden" name="op" value="cud-renew" />
77
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override limit and renew</button>
77
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override limit and renew</button>
78
                    </form>
78
                    </form>
Lines 84-90 Link Here
84
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
84
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
85
                        [% INCLUDE 'csrf-token.inc' %]
85
                        [% INCLUDE 'csrf-token.inc' %]
86
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
86
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
87
                        <input type="hidden" name="override_limit" value="1" />
87
                        <input type="hidden" name="override_limit" value="TOO_SOON" />
88
                        <input type="hidden" name="op" value="cud-renew" />
88
                        <input type="hidden" name="op" value="cud-renew" />
89
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override and renew</button>
89
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override and renew</button>
90
                    </form>
90
                    </form>
Lines 96-102 Link Here
96
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
96
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
97
                        [% INCLUDE 'csrf-token.inc' %]
97
                        [% INCLUDE 'csrf-token.inc' %]
98
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
98
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
99
                        <input type="hidden" name="override_limit" value="1" />
99
                        <input type="hidden" name="override_limit" value="AUTO_TOO_SOON" />
100
                        <input type="hidden" name="op" value="cud-renew" />
100
                        <input type="hidden" name="op" value="cud-renew" />
101
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override and renew</button>
101
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override and renew</button>
102
                    </form>
102
                    </form>
Lines 108-114 Link Here
108
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
108
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
109
                        [% INCLUDE 'csrf-token.inc' %]
109
                        [% INCLUDE 'csrf-token.inc' %]
110
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
110
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
111
                        <input type="hidden" name="override_limit" value="1" />
111
                        <input type="hidden" name="override_limit" value="AUTO_TOO_LATE" />
112
                        <input type="hidden" name="op" value="cud-renew" />
112
                        <input type="hidden" name="op" value="cud-renew" />
113
                        <input type="submit" class="btn btn-default approve" value="Override and renew" />
113
                        <input type="submit" class="btn btn-default approve" value="Override and renew" />
114
                    </form>
114
                    </form>
Lines 120-138 Link Here
120
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
120
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
121
                        [% INCLUDE 'csrf-token.inc' %]
121
                        [% INCLUDE 'csrf-token.inc' %]
122
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
122
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
123
                        <input type="hidden" name="override_limit" value="1" />
123
                        <input type="hidden" name="override_limit" value="ACCOUNT_EXPIRED" />
124
                        <input type="hidden" name="op" value="cud-renew" />
124
                        <input type="hidden" name="op" value="cud-renew" />
125
                        <input type="submit" class="btn btn-default approve" value="Override and renew" />
125
                        <input type="submit" class="btn btn-default approve" value="Override and renew" />
126
                    </form>
126
                    </form>
127
                [% END %]
127
                [% END %]
128
            [% ELSIF error == "auto_renew" or error == "auto_too_much_oweing" %]
128
            [% ELSIF error == "auto_renew" or error == "auto_too_much_oweing" %]
129
                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal. </p>
129
                <p>[% INCLUDE 'biblio-title.inc' biblio=item.biblio link = 1 %] ( [% item.barcode | html %] ) has been scheduled for automatic renewal. </p>
130
                [% SET override_limit = error == "auto_renew" ? "AUTO_RENEW" : "TOO_MUCH" %]
130
131
131
                [% IF Koha.Preference('AllowRenewalLimitOverride') %]
132
                [% IF Koha.Preference('AllowRenewalLimitOverride') %]
132
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
133
                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
133
                        [% INCLUDE 'csrf-token.inc' %]
134
                        [% INCLUDE 'csrf-token.inc' %]
134
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
135
                        <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
135
                        <input type="hidden" name="override_limit" value="1" />
136
                        <input type="hidden" name="override_limit" value="[% override_limit | html %]" />
136
                        <input type="hidden" name="op" value="cud-renew" />
137
                        <input type="hidden" name="op" value="cud-renew" />
137
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override limit and renew</button>
138
                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Override limit and renew</button>
138
                    </form>
139
                    </form>
Lines 143-149 Link Here
143
                <form method="post" action="/cgi-bin/koha/circ/renew.pl">
144
                <form method="post" action="/cgi-bin/koha/circ/renew.pl">
144
                    [% INCLUDE 'csrf-token.inc' %]
145
                    [% INCLUDE 'csrf-token.inc' %]
145
                    <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
146
                    <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
146
                    <input type="hidden" name="override_limit" value="1" />
147
                    <input type="hidden" name="override_limit" value="ON_RESERVE" />
147
                    <input type="hidden" name="override_holds" value="1" />
148
                    <input type="hidden" name="override_holds" value="1" />
148
                    <div>
149
                    <div>
149
                        <label for="renewonholdduedate">Renewal due date:</label>
150
                        <label for="renewonholdduedate">Renewal due date:</label>
150
- 

Return to bug 9762