Bugzilla – Attachment 69811 Details for
Bug 19444
Automatic renewal script should not auto-renew if a patron's record has expired
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19444: Display error message for auto_account_expired
Bug-19444-Display-error-message-for-autoaccountexp.patch (text/plain), 5.60 KB, created by
Julian Maurice
on 2017-12-15 09:10:52 UTC
(
hide
)
Description:
Bug 19444: Display error message for auto_account_expired
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2017-12-15 09:10:52 UTC
Size:
5.60 KB
patch
obsolete
>From c451888a69c22a124e0dbe1c68e32699d59f38ac Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 5 Dec 2017 10:23:09 -0300 >Subject: [PATCH] Bug 19444: Display error message for auto_account_expired > >Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 14 +++++++++++++- > koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 7 +++++++ > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 +++ > 4 files changed, 24 insertions(+), 1 deletion(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >index 82ff7753ab..e116204cdc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc >@@ -19,6 +19,7 @@ > var NOT_RENEWABLE_AUTO_TOO_SOON = _("Scheduled for automatic renewal"); > var NOT_RENEWABLE_AUTO_TOO_LATE = _("Can no longer be auto-renewed - number of checkout days exceeded"); > var NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING = _("Automatic renewal failed, patron has unpaid fines"); >+ var NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED = _("Automatic renewal failed, account expired"); > var NOT_RENEWABLE_AUTO_RENEW = _("Scheduled for automatic renewal"); > var RENEWALS_REMAINING = _("%s of %s renewals remaining"); > var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>"); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index 66b0ee7d65..6478758b38 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -78,7 +78,19 @@ > </form> > [% END %] > >- [% ELSIF error == "auto_renew" or error == "auto_too_much_oweing" %] >+ [% ELSIF error == "auto_account_expired" %] >+ >+ <p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal and cannot be renewed because the patron's account is expired</p> >+ >+ [% IF Koha.Preference('AllowRenewalLimitOverride') %] >+ <form method="post" action="/cgi-bin/koha/circ/renew.pl"> >+ <input type="hidden" name="barcode" value="[% item.barcode %]"/> >+ <input type="hidden" name="override_limit" value="1" /> >+ <input type="submit" class="approve" value="Override and renew" /> >+ </form> >+ [% END %] >+ >+ [% ELSIF error == "auto_renew" or error == "auto_too_much_oweing" or error == "auto_account_expired" %] > > <p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal. </p> > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >index 9ec8d43ece..4488af9d74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >@@ -383,6 +383,13 @@ $(document).ready(function() { > > span_style = "display: none"; > span_class = "renewals-allowed"; >+ } else if ( oObj.can_renew_error == "auto_account_expired" ) { >+ content += "<span class='renewals-disabled'>" >+ + NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED >+ + "</span>"; >+ >+ span_style = "display: none"; >+ span_class = "renewals-allowed"; > } else if ( oObj.can_renew_error == "auto_renew" ) { > content += "<span class='renewals-disabled'>" > + NOT_RENEWABLE_AUTO_RENEW >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 78344ce347..35cf5a0456 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -297,6 +297,9 @@ Using this account is not recommended because some parts of Koha will not functi > [% ELSIF ISSUE.auto_too_much_oweing %] > Automatic renewal failed, you have unpaid fines. > <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span> >+ [% ELSIF ISSUE.auto_account_expired %] >+ Automatic renewal failed, your account is expired. >+ <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span> > [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %] > Automatic renewal > <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span> >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19444
:
68633
|
69502
|
69503
|
69504
|
69810
| 69811 |
69812
|
69813