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

(-)a/C4/Circulation.pm (-2 / +22 lines)
Lines 3458-3463 sub AddRenewal { Link Here
3458
    my $seen              = $params->{seen};
3458
    my $seen              = $params->{seen};
3459
    my $automatic         = $params->{automatic};
3459
    my $automatic         = $params->{automatic};
3460
    my $skip_record_index = $params->{skip_record_index};
3460
    my $skip_record_index = $params->{skip_record_index};
3461
    my $confirmations     = $params->{confirmations};
3462
    my $forced            = $params->{forced};
3461
3463
3462
    # Fallback on a 'seen' renewal
3464
    # Fallback on a 'seen' renewal
3463
    $seen = defined $seen && $seen == 0 ? 0 : 1;
3465
    $seen = defined $seen && $seen == 0 ? 0 : 1;
Lines 3531-3540 sub AddRenewal { Link Here
3531
                );
3533
                );
3532
                if ( !$seen && $rule && looks_like_number( $rule->rule_value ) ) {
3534
                if ( !$seen && $rule && looks_like_number( $rule->rule_value ) ) {
3533
                    $unseen_renewals++;
3535
                    $unseen_renewals++;
3536
                    push @{$confirmations}, 'UNSEEN';
3534
                } else {
3537
                } else {
3535
3538
3536
                    # If the renewal is seen, unseen should revert to 0
3539
                    # If the renewal is seen, unseen should revert to 0
3537
                    $unseen_renewals = 0;
3540
                    $unseen_renewals = 0;
3541
                    push @{$confirmations}, 'SEEN';
3538
                }
3542
                }
3539
            }
3543
            }
3540
3544
Lines 3647-3654 sub AddRenewal { Link Here
3647
            };
3651
            };
3648
3652
3649
            #Log the renewal
3653
            #Log the renewal
3650
            logaction( "CIRCULATION", "RENEWAL", $borrowernumber, $itemnumber )
3654
            if ( C4::Context->preference("RenewalLog") ) {
3651
                if C4::Context->preference("RenewalLog");
3655
                my $info = $itemnumber;
3656
                if ( defined($confirmations) || defined($forced) ) {
3657
                    $info = to_json(
3658
                        {
3659
                            issue         => $issue->issue_id,
3660
                            itemnumber    => $itemnumber,
3661
                            confirmations => $confirmations,
3662
                            forced        => $forced
3663
                        },
3664
                        {
3665
                            pretty    => 1,
3666
                            cononical => 1
3667
                        }
3668
                    );
3669
                }
3670
                logaction( "CIRCULATION", "RENEWAL", $borrowernumber, $info );
3671
            }
3652
3672
3653
            Koha::Plugins->call(
3673
            Koha::Plugins->call(
3654
                'after_circ_action',
3674
                'after_circ_action',
(-)a/circ/renew.pl (-4 / +7 lines)
Lines 71-79 if ( $op eq 'cud-renew' && $barcode ) { Link Here
71
            my @message;
71
            my @message;
72
72
73
            if ( ( $patron->is_debarred || q{} ) lt dt_from_string()->ymd() ) {
73
            if ( ( $patron->is_debarred || q{} ) lt dt_from_string()->ymd() ) {
74
                my $confirmations;
74
                my $can_renew;
75
                my $can_renew;
75
                my $info;
76
                my $info;
76
                ( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit );
77
                ( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit );
78
                push @{$confirmations}, $override_limit if $override_limit;
77
79
78
                if ( $error && ( $error eq 'on_reserve' ) ) {
80
                if ( $error && ( $error eq 'on_reserve' ) ) {
79
                    if ($override_holds) {
81
                    if ($override_holds) {
Lines 123-132 if ( $op eq 'cud-renew' && $barcode ) { Link Here
123
125
124
                    $date_due = AddRenewal(
126
                    $date_due = AddRenewal(
125
                        {
127
                        {
126
                            itemnumber => $item->itemnumber(),
128
                            itemnumber    => $item->itemnumber(),
127
                            branch     => $branchcode,
129
                            branch        => $branchcode,
128
                            datedue    => $date_due,
130
                            datedue       => $date_due,
129
                            seen       => !$unseen
131
                            seen          => !$unseen,
132
                            confirmations => $confirmations
130
                        }
133
                        }
131
                    );
134
                    );
132
                    $template->param( date_due => $date_due );
135
                    $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