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

(-)a/circ/renew.pl (-1 / +10 lines)
Lines 50-56 my $override_holds = $cgi->param('override_holds'); Link Here
50
my $hard_due_date  = $cgi->param('hard_due_date');
50
my $hard_due_date  = $cgi->param('hard_due_date');
51
51
52
my ( $item, $checkout, $patron );
52
my ( $item, $checkout, $patron );
53
my $error = q{};
53
my $error         = q{};
54
my $final_renewal = 0;
54
my ( $soonest_renew_date, $latest_auto_renew_date );
55
my ( $soonest_renew_date, $latest_auto_renew_date );
55
56
56
if ( $op eq 'cud-renew' && $barcode ) {
57
if ( $op eq 'cud-renew' && $barcode ) {
Lines 73-78 if ( $op eq 'cud-renew' && $barcode ) { Link Here
73
                ( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit );
74
                ( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit );
74
                push @{$confirmations}, 'RENEWAL_LIMIT' if $override_limit;
75
                push @{$confirmations}, 'RENEWAL_LIMIT' if $override_limit;
75
76
77
                if ( $error && ( $error eq 'auto_renew_final' ) ) {
78
79
                    # This error implies it can be renewed - but not again after this, so no error
80
                    $error         = undef;
81
                    $final_renewal = 1;
82
                }
83
76
                if ( $error && ( $error eq 'on_reserve' ) ) {
84
                if ( $error && ( $error eq 'on_reserve' ) ) {
77
                    if ($override_holds) {
85
                    if ($override_holds) {
78
                        $can_renew = 1;
86
                        $can_renew = 1;
Lines 125-130 if ( $op eq 'cud-renew' && $barcode ) { Link Here
125
        issue               => $checkout,
133
        issue               => $checkout,
126
        borrower            => $patron,
134
        borrower            => $patron,
127
        error               => $error,
135
        error               => $error,
136
        final_renewal       => $final_renewal,
128
        soonestrenewdate    => $soonest_renew_date,
137
        soonestrenewdate    => $soonest_renew_date,
129
        latestautorenewdate => $latest_auto_renew_date,
138
        latestautorenewdate => $latest_auto_renew_date,
130
    );
139
    );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-1 / +3 lines)
Lines 188-193 Link Here
188
                ) renewed for [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) now due
188
                ) renewed for [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) now due
189
                on [% date_due | $KohaDates as_due_date => 1 %]
189
                on [% date_due | $KohaDates as_due_date => 1 %]
190
            </p>
190
            </p>
191
            [% IF final_renewal %]
192
                <p class="final_renewal">NOTE: This is the last allowed renewal on this item</p>
193
            [% END %]
191
        </div>
194
        </div>
192
    [% END %]
195
    [% END %]
193
196
194
- 

Return to bug 41090