Attachment 109876 Details for Bug 23415 – Bug 23415: Use OPACFineNoRenewals instead of noissuecharge

[patch] Bug 23415: Use OPACFineNoRenewals instead of noissuecharge

0003-Bug-23415-Use-OPACFineNoRenewals-instead-of-noissuec.patch (text/plain), 3.67 KB, created by Emmi Takkinen on 2020-09-11 06:09:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmi Takkinen

Created: 2020-09-11 06:09:55 UTC

Size: 3.67 KB

patch

obsolete

>From 1f42c421be03d16e6a5b0dc9f00d8ccd9f00fc8a Mon Sep 17 00:00:00 2001
>From: Emmi Takkinen <emmi.takkinen@outlook.com>
>Date: Tue, 31 Mar 2020 12:19:28 +0300
>Subject: [PATCH 3/4] Bug 23415: Use OPACFineNoRenewals instead of
> noissuecharge
>
>Since noissuecharge is mainly fine limit for checkouts it's
>more logical to use value in OPACFineNoRenewals.
>
>Sponsored-by: Koha-Suomi Oy
>---
> circ/renew.pl                                                   | 2 +-
> .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref   | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt     | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt   | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/circ/renew.pl b/circ/renew.pl
>index f88520e083..2c2659e886 100755
>--- a/circ/renew.pl
>+++ b/circ/renew.pl
>@@ -68,7 +68,7 @@ if ($barcode) {
>             $borrower = $issue->borrower();
>             my $patron = Koha::Patrons->find($borrower->borrowernumber);
>             $balance = $patron->account->balance;
>-            my $amountlimit = C4::Context->preference("noissuescharge");
>+            my $amountlimit = C4::Context->preference("OPACFineNoRenewals");
> 
>             if ( ( $borrower->debarred() || q{} ) lt dt_from_string()->ymd() ) {
>                 my $can_renew;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index e078692ff6..303d979be7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -593,7 +593,7 @@ OPAC:
>             - Only allow patrons to renew their own books on the OPAC if they have less than
>             - pref: OPACFineNoRenewals
>               class: currency
>-            - '[% local_currency %] in fines (leave blank to disable).'
>+            - '[% local_currency %] in fines (leave blank to disable). If set, confirmation dialog is shown when renewing for patron with fines.'
>         -
>             - pref: OPACFineNoRenewalsIncludeCredits
>               choices:
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 8bedea5454..43a4730513 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -1095,7 +1095,7 @@
> 
>         [% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
> 
>-        var amountlimit = "[% Koha.Preference('noissuescharge') | html %]";
>+        var amountlimit = "[% Koha.Preference('OPACFineNoRenewals') | html %]";
>         var fines = "[% fines | html %]";
>         var MSG_CONFRIM_RENEW = _("The patron has a debt of %s.\n Are you sure you want to renew checkout(s)?").format(fines);
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 4a3128e1d8..e22c1a410f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -953,7 +953,7 @@
> 
>         columns_settings_issues_table = [% TablesSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
> 
>-        var amountlimit = "[% Koha.Preference('noissuescharge') | html %]";
>+        var amountlimit = "[% Koha.Preference('OPACFineNoRenewals') | html %]";
>         var fines = "[% fines | html %]";
>         var MSG_CONFRIM_RENEW = _("The patron has a debt of %s.\n Are you sure you want to renew checkout(s)?").format(fines);
> 
>-- 
>2.17.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 23415: 92039 | 92541 | 98442 | 98634 | 98996 | 98997 | 105893 | 105894 | 108392 | 109871 | 109872 | 109876 | 109880 | 116919 | 116920 | 116921 | 116922 | 118175 | 118176 | 118177 | 118178 | 118183 | 119300 | 119301 | 119302 | 119303 | 121472 | 139670 | 139671 | 139672 | 139673 | 139674 | 146415 | 148198 | 148199 | 148200 | 148201 | 148202 | 152776 | 152777 | 152778 | 152779 | 152780 | 152781 | 154595 | 154596 | 154597 | 154598 | 154599 | 154600 | 158302 | 158303 | 158304 | 158305 | 158306 | 158307 | 161964 | 161965 | 161966 | 161967 | 161968 | 161969 | 162171 | 162172 | 162173 | 162174 | 162175 | 162176 | 162177 | 162178 | 162179 | 162180 | 171620 | 171621 | 171622 | 171623 | 171983 | 171984 | 171985 | 171986 | 172906 | 172907 | 172908 | 172909 | 172910