Attachment #71136 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 %] [% 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 %]

Lines 399-404 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (+7 lines)
399	span_class = "renewals-allowed";	399	span_class = "renewals-allowed";
400	} else if ( oObj.can_renew_error == "onsite_checkout" ) {	400	} else if ( oObj.can_renew_error == "onsite_checkout" ) {
401	// Don't display something if it's an onsite checkout	401	// Don't display something if it's an onsite checkout
		402	} else if ( oObj.can_renew_error == "item_denied_renewal" ) {
		403	content += "<span class='renewals-disabled'>"
		404	+ NOT_RENEWABLE_DENIED
		405	+ "</span>";
		406
		407	span_style = "display: none";
		408	span_class = "renewals-allowed";
402	} else {	409	} else {
403	content += "<span class='renewals-disabled'>"	410	content += "<span class='renewals-disabled'>"
404	+ oObj.can_renew_error	411	+ oObj.can_renew_error

Lines 92-97 Using this account is not recommended because some parts of Koha will not functi Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+4 lines)
92	<li>It is too soon after the checkout date for this item to be renewed.</li>	92	<li>It is too soon after the checkout date for this item to be renewed.</li>
93	[% ELSIF error == 'on_reserve' %]	93	[% ELSIF error == 'on_reserve' %]
94	<li>This item is on hold for another borrower.</li>	94	<li>This item is on hold for another borrower.</li>
		95	[% ELSIF error == 'item_denied_renewal' %]
		96	<li>Item renewal is not allowed.</li>
95	[% END %]	97	[% END %]
96	[% END %]	98	[% END %]
97	</ul>	99	</ul>
Lines 306-311 Using this account is not recommended because some parts of Koha will not functi Link Here
306	[% ELSIF ( ISSUE.too_soon ) %]	308	[% ELSIF ( ISSUE.too_soon ) %]
307	No renewal before [% ISSUE.soonestrenewdate %]	309	No renewal before [% ISSUE.soonestrenewdate %]
308	<span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>	310	<span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
		311	[% ELSIF ( ISSUE.item_denied_renewal ) %]
		312	Renewal not allowed
309	[% END %]	313	[% END %]
310	</td>	314	</td>
311	[% END %]	315	[% 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 224-229 if ($issues){ Link Here

(-)a/opac/opac-user.pl (-1 / +1 lines)
224	$issue->{'auto_too_soon'} = 1 if $renewerror eq 'auto_too_soon';	224	$issue->{'auto_too_soon'} = 1 if $renewerror eq 'auto_too_soon';
225	$issue->{'auto_too_late'} = 1 if $renewerror eq 'auto_too_late';	225	$issue->{'auto_too_late'} = 1 if $renewerror eq 'auto_too_late';
226	$issue->{'auto_too_much_oweing'} = 1 if $renewerror eq 'auto_too_much_oweing';	226	$issue->{'auto_too_much_oweing'} = 1 if $renewerror eq 'auto_too_much_oweing';
		227	$issue->{'item_denied_renewal'} = 1 if $renewerror eq 'item_denied_renewal';
227		228
228	if ( $renewerror eq 'too_soon' ) {	229	if ( $renewerror eq 'too_soon' ) {
229	$issue->{'too_soon'} = 1;	230	$issue->{'too_soon'} = 1;
230	-

Return to bug 15494