From 4b033673191ea170fc8d1c037726ddc2ef8e0ca6 Mon Sep 17 00:00:00 2001 From: Emmi Takkinen Date: Tue, 31 Mar 2020 12:19:28 +0300 Subject: [PATCH] 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 Signed-off-by: Petro Vashchuk Signed-off-by: Veli-Matti --- circ/renew.pl | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 1 + 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(+), 3 deletions(-) diff --git a/circ/renew.pl b/circ/renew.pl index adb92e5ff8..7bab6c4d65 100755 --- a/circ/renew.pl +++ b/circ/renew.pl @@ -67,7 +67,7 @@ if ($barcode) { $patron = $checkout->patron; $balance = $patron->account->balance; - my $amountlimit = C4::Context->preference("noissuescharge"); + my $amountlimit = C4::Context->preference("OPACFineNoRenewals"); if ( ( $patron->is_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 060e76b2de..0a6688387b 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 @@ -607,6 +607,7 @@ OPAC: - pref: OPACFineNoRenewals class: currency - '[% local_currency %] in charges (leave blank to disable).' + -
NOTE: If set, confirmation dialog is shown when renewing for patron with charges from staff interface.' - - 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 8886a2082b..31ea256e35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -917,7 +917,7 @@ [% UNLESS ( patron.borrowernumber ) %]window.onload=function(){ $('#findborrower').focus(); };[% 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 5c3ade9e0e..f566f8a70b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -710,7 +710,7 @@ table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %] table_settings_relatives_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'relatives-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.30.2