Attachment 61086 Details for Bug 15705 – Bug 15705: Add specific warning messages for auto_too_much_oweing

[patch] Bug 15705: Add specific warning messages for auto_too_much_oweing

Bug-15705-Add-specific-warning-messages-for-autoto.patch (text/plain), 4.28 KB, created by Jonathan Druart on 2017-03-14 16:42:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-03-14 16:42:38 UTC

Size: 4.28 KB

patch

obsolete

>From c19332479d4fa2f4d7b521682e52bdd9cc8e521d Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 24 Oct 2016 11:43:31 +0000
>Subject: [PATCH] Bug 15705: Add specific warning messages for
> auto_too_much_oweing
>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc | 1 +
> koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 7 +++++++
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 3 +++
> opac/opac-user.pl | 1 +
> 4 files changed, 12 insertions(+)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>index 7483ccf..7560fc2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
>@@ -18,6 +18,7 @@
> var NOT_RENEWABLE_TOO_SOON = _("No renewal before %s");
> 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_RENEW = _("Scheduled for automatic renewal");
> var RENEWALS_REMAINING = _("%s of %s renewals remaining");
> var HOLD_IS_SUSPENDED = _("Hold is suspended");
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>index 1ef2375..fe577ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
>@@ -355,6 +355,13 @@ $(document).ready(function() {
> 
> span_style = "display: none";
> span_class = "renewals-allowed";
>+ } else if ( oObj.can_renew_error == "auto_too_much_oweing" ) {
>+ content += ""
>+ + NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING
>+ + "";
>+
>+ span_style = "display: none";
>+ span_class = "renewals-allowed";
> } else if ( oObj.can_renew_error == "auto_renew" ) {
> content += ""
> + 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 a715178..2405c6a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -268,6 +268,9 @@ Using this account is not recommended because some parts of Koha will not functi
> Not allowed (overdue)
> [% ELSIF ( ISSUE.auto_too_late ) %]
> No longer renewable
>+ [% ELSIF ISSUE.auto_too_much_oweing %]
>+ Automatic renewal failed, you have unpaid fines.
>+ ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
> [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
> Automatic renewal
> ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)
>diff --git a/opac/opac-user.pl b/opac/opac-user.pl
>index 905d52c..b09ba62 100755
>--- a/opac/opac-user.pl
>+++ b/opac/opac-user.pl
>@@ -215,6 +215,7 @@ if ($issues){
> $issue->{'auto_renew'} = 1 if $renewerror eq 'auto_renew';
> $issue->{'auto_too_soon'} = 1 if $renewerror eq 'auto_too_soon';
> $issue->{'auto_too_late'} = 1 if $renewerror eq 'auto_too_late';
>+ $issue->{'auto_too_much_oweing'} = 1 if $renewerror eq 'auto_too_much_oweing';
> 
> if ( $renewerror eq 'too_soon' ) {
> $issue->{'too_soon'} = 1;
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15705: 47470 | 47471 | 47472 | 50336 | 50337 | 50338 | 50341 | 50342 | 50344 | 50345 | 50346 | 50680 | 50681 | 50682 | 50683 | 50732 | 50733 | 56756 | 56757 | 56758 | 56759 | 56760 | 56798 | 56799 | 56981 | 56983 | 57741 | 57742 | 57743 | 57744 | 57745 | 57746 | 57747 | 61080 | 61081 | 61082 | 61083 | 61084 | 61085 | 61086 | 61495 | 61496 | 61497 | 61498 | 61499 | 61500 | 61501 | 61739 | 62072 | 63036 | 63037 | 63138 | 63139 | 63140 | 63141 | 63142 | 63143 | 63144