Attachment #80329 for bug #15494

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

Lines 51-56 sub do_renew_for { Link Here

(-)a/C4/SIP/ILS/Transaction/Renew.pm (+1 lines)
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	}

Lines 21-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
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_ACCOUNT_EXPIRED = _("Automatic renewal failed, account expired");	22	var NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED = _("Automatic renewal failed, account expired");
23	var NOT_RENEWABLE_AUTO_RENEW = _("Scheduled for automatic renewal");	23	var NOT_RENEWABLE_AUTO_RENEW = _("Scheduled for automatic renewal");
		24	var NOT_RENEWABLE_DENIED = _("Renewal denied by syspref");
24	var RENEWALS_REMAINING = _("%s of %s renewals remaining");	25	var RENEWALS_REMAINING = _("%s of %s renewals remaining");
25	var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");	26	var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
26	var UNTIL = _("until %s");	27	var UNTIL = _("until %s");

Lines 117-122 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (+4 lines)
117		117
118	<p>[% borrower.firstname \| html %] [% borrower.surname \| html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber \| html %]"> [% borrower.cardnumber \| html %] </a> ) is currently restricted.</p>	118	<p>[% borrower.firstname \| html %] [% borrower.surname \| html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber \| html %]"> [% borrower.cardnumber \| html %] </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 \| html %]	126	[% error \| html %]

Lines 424-429 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+7 lines)
424	span_class = "renewals-allowed";	424	span_class = "renewals-allowed";
425	} else if ( oObj.can_renew_error == "onsite_checkout" ) {	425	} else if ( oObj.can_renew_error == "onsite_checkout" ) {
426	// Don't display something if it's an onsite checkout	426	// Don't display something if it's an onsite checkout
		427	} else if ( oObj.can_renew_error == "item_denied_renewal" ) {
		428	content += "<span class='renewals-disabled'>"
		429	+ NOT_RENEWABLE_DENIED
		430	+ "</span>";
		431
		432	span_style = "display: none";
		433	span_class = "renewals-allowed";
427	} else {	434	} else {
428	content += "<span class='renewals-disabled'>"	435	content += "<span class='renewals-disabled'>"
429	+ oObj.can_renew_error	436	+ oObj.can_renew_error

Lines 83-88 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+4 lines)
83	<li>It is too soon after the checkout date for this item to be renewed.</li>	83	<li>It is too soon after the checkout date for this item to be renewed.</li>
84	[% ELSIF error == 'on_reserve' %]	84	[% ELSIF error == 'on_reserve' %]
85	<li>This item is on hold for another borrower.</li>	85	<li>This item is on hold for another borrower.</li>
		86	[% ELSIF error == 'item_denied_renewal' %]
		87	<li>Item renewal is not allowed.</li>
86	[% END %]	88	[% END %]
87	[% END %]	89	[% END %]
88	</ul>	90	</ul>
Lines 312-317 Link Here
312	[% ELSIF ( ISSUE.too_soon ) %]	314	[% ELSIF ( ISSUE.too_soon ) %]
313	No renewal before [% ISSUE.soonestrenewdate \| html %]	315	No renewal before [% ISSUE.soonestrenewdate \| html %]
314	<span class="renewals">([% ISSUE.renewsleft \| html %] of [% ISSUE.renewsallowed \| html %] renewals remaining)</span>	316	<span class="renewals">([% ISSUE.renewsleft \| html %] of [% ISSUE.renewsallowed \| html %] renewals remaining)</span>
		317	[% ELSIF ( ISSUE.item_denied_renewal ) %]
		318	Renewal not allowed
315	[% END %]	319	[% END %]
316	</td>	320	</td>
317	[% END %]	321	[% END %]

Lines 88-94 while ( my $auto_renew = $auto_renews->next ) { Link Here

(-)a/misc/cronjobs/automatic_renewals.pl (-1 / +2 lines)
88	or $error eq 'auto_account_expired'	88	or $error eq 'auto_account_expired'
89	or $error eq 'auto_too_late'	89	or $error eq 'auto_too_late'
90	or $error eq 'auto_too_much_oweing'	90	or $error eq 'auto_too_much_oweing'
91	or $error eq 'auto_too_soon' ) {	91	or $error eq 'auto_too_soon'
		92	or $error eq 'item_denied_renewal' ) {
92	if ( not $auto_renew->auto_renew_error or $error ne $auto_renew->auto_renew_error ) {	93	if ( not $auto_renew->auto_renew_error or $error ne $auto_renew->auto_renew_error ) {
93	$auto_renew->auto_renew_error($error)->store;	94	$auto_renew->auto_renew_error($error)->store;
94	push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew	95	push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew

Lines 235-240 if ( $pending_checkouts->count ) { # Useless test Link Here

(-)a/opac/opac-user.pl (-1 / +1 lines)
235	$issue->{'auto_too_soon'} = 1 if $renewerror eq 'auto_too_soon';	235	$issue->{'auto_too_soon'} = 1 if $renewerror eq 'auto_too_soon';
236	$issue->{'auto_too_late'} = 1 if $renewerror eq 'auto_too_late';	236	$issue->{'auto_too_late'} = 1 if $renewerror eq 'auto_too_late';
237	$issue->{'auto_too_much_oweing'} = 1 if $renewerror eq 'auto_too_much_oweing';	237	$issue->{'auto_too_much_oweing'} = 1 if $renewerror eq 'auto_too_much_oweing';
		238	$issue->{'item_denied_renewal'} = 1 if $renewerror eq 'item_denied_renewal';
238		239
239	if ( $renewerror eq 'too_soon' ) {	240	if ( $renewerror eq 'too_soon' ) {
240	$issue->{'too_soon'} = 1;	241	$issue->{'too_soon'} = 1;
241	-

Return to bug 15494