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

(-)a/C4/SIP/ILS/Transaction/Renew.pm (+1 lines)
Lines 51-56 sub do_renew_for { Link Here
51
    } else {
51
    } else {
52
        $renewerror=~s/on_reserve/Item unavailable due to outstanding holds/;
52
        $renewerror=~s/on_reserve/Item unavailable due to outstanding holds/;
53
        $renewerror=~s/too_many/Item has reached maximum renewals/;
53
        $renewerror=~s/too_many/Item has reached maximum renewals/;
54
        $renewerror=~s/item_denied_renewal/Item renewal is not allowed/;
54
        $self->screen_msg($renewerror);
55
        $self->screen_msg($renewerror);
55
        $self->renewal_ok(0);
56
        $self->renewal_ok(0);
56
    }
57
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
Lines 20-25 Link Here
20
    var NOT_RENEWABLE_AUTO_TOO_LATE = _("Can no longer be auto-renewed - number of checkout days exceeded");
20
    var NOT_RENEWABLE_AUTO_TOO_LATE = _("Can no longer be auto-renewed - number of checkout days exceeded");
21
    var NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING = _("Automatic renewal failed, patron has unpaid fines");
21
    var NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING = _("Automatic renewal failed, patron has unpaid fines");
22
    var NOT_RENEWABLE_AUTO_RENEW = _("Scheduled for automatic renewal");
22
    var NOT_RENEWABLE_AUTO_RENEW = _("Scheduled for automatic renewal");
23
    var NOT_RENEWABLE_DENIED = _("Renewal denied by syspref");
23
    var RENEWALS_REMAINING = _("%s of %s renewals remaining");
24
    var RENEWALS_REMAINING = _("%s of %s renewals remaining");
24
    var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
25
    var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
25
    var UNTIL = _("until %s");
26
    var UNTIL = _("until %s");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (+4 lines)
Lines 117-122 Link Here
117
117
118
                                <p>[% borrower.firstname %] [% borrower.surname %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]"> [% borrower.cardnumber %] </a> ) is currently restricted.</p>
118
                                <p>[% borrower.firstname %] [% borrower.surname %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]"> [% borrower.cardnumber %] </a> ) is currently restricted.</p>
119
119
120
                            [% ELSIF error == "item_denied_renewal" %]
121
122
                                <p>Item is not allowed renewal.</p>
123
120
                            [% ELSE %]
124
                            [% ELSE %]
121
125
122
                                [% error %]
126
                                [% error %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+7 lines)
Lines 392-397 $(document).ready(function() { Link Here
392
                            span_class = "renewals-allowed";
392
                            span_class = "renewals-allowed";
393
                        } else if ( oObj.can_renew_error == "onsite_checkout" ) {
393
                        } else if ( oObj.can_renew_error == "onsite_checkout" ) {
394
                            // Don't display something if it's an onsite checkout
394
                            // Don't display something if it's an onsite checkout
395
                        } else if ( oObj.can_renew_error == "item_denied_renewal" ) {
396
                            content += "<span class='renewals-disabled'>"
397
                                    + NOT_RENEWABLE_DENIED
398
                                    + "</span>";
399
400
                            span_style = "display: none";
401
                            span_class = "renewals-allowed";
395
                        } else {
402
                        } else {
396
                            content += "<span class='renewals-disabled'>"
403
                            content += "<span class='renewals-disabled'>"
397
                                    + oObj.can_renew_error
404
                                    + oObj.can_renew_error
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+4 lines)
Lines 92-97 Using this account is not recommended because some parts of Koha will not functi Link Here
92
                                        It is too soon after the checkout date for this item to be renewed.
92
                                        It is too soon after the checkout date for this item to be renewed.
93
                                    [% ELSIF error == 'on_reserve' %]
93
                                    [% ELSIF error == 'on_reserve' %]
94
                                        This item is on hold for another borrower.
94
                                        This item is on hold for another borrower.
95
                                    [% ELSIF error == 'item_denied_renewal' %]
96
                                        Item renewal is not allowed.
95
                                    [% END %]
97
                                    [% END %]
96
                                [% END %]
98
                                [% END %]
97
                            </span>
99
                            </span>
Lines 300-305 Using this account is not recommended because some parts of Koha will not functi Link Here
300
                                                    [% ELSIF ( ISSUE.too_soon ) %]
302
                                                    [% ELSIF ( ISSUE.too_soon ) %]
301
                                                        No renewal before [% ISSUE.soonestrenewdate %]
303
                                                        No renewal before [% ISSUE.soonestrenewdate %]
302
                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
304
                                                        <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
305
                                                    [% ELSIF ( ISSUE.item_denied_renewal ) %]
306
                                                        Renewal not allowed
303
                                                    [% END %]
307
                                                    [% END %]
304
                                                    </td>
308
                                                    </td>
305
                                                [% END %]
309
                                                [% END %]
(-)a/misc/cronjobs/automatic_renewals.pl (-1 / +2 lines)
Lines 87-93 while ( my $auto_renew = $auto_renews->next ) { Link Here
87
        or $error eq 'overdue'
87
        or $error eq 'overdue'
88
        or $error eq 'auto_too_late'
88
        or $error eq 'auto_too_late'
89
        or $error eq 'auto_too_much_oweing'
89
        or $error eq 'auto_too_much_oweing'
90
        or $error eq 'auto_too_soon' ) {
90
        or $error eq 'auto_too_soon'
91
        or $error eq 'item_denied_renewal' ) {
91
        if ( not $auto_renew->auto_renew_error or $error ne $auto_renew->auto_renew_error ) {
92
        if ( not $auto_renew->auto_renew_error or $error ne $auto_renew->auto_renew_error ) {
92
            $auto_renew->auto_renew_error($error)->store;
93
            $auto_renew->auto_renew_error($error)->store;
93
            push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew
94
            push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew
(-)a/opac/opac-user.pl (-1 / +1 lines)
Lines 223-228 if ($issues){ Link Here
223
            $issue->{'auto_too_soon'}  = 1 if $renewerror eq 'auto_too_soon';
223
            $issue->{'auto_too_soon'}  = 1 if $renewerror eq 'auto_too_soon';
224
            $issue->{'auto_too_late'}  = 1 if $renewerror eq 'auto_too_late';
224
            $issue->{'auto_too_late'}  = 1 if $renewerror eq 'auto_too_late';
225
            $issue->{'auto_too_much_oweing'}  = 1 if $renewerror eq 'auto_too_much_oweing';
225
            $issue->{'auto_too_much_oweing'}  = 1 if $renewerror eq 'auto_too_much_oweing';
226
            $issue->{'item_denied_renewal'}  = 1 if $renewerror eq 'item_denied_renewal';
226
227
227
            if ( $renewerror eq 'too_soon' ) {
228
            if ( $renewerror eq 'too_soon' ) {
228
                $issue->{'too_soon'}         = 1;
229
                $issue->{'too_soon'}         = 1;
229
- 

Return to bug 15494