From 58e05f05cbc41c8c1639bddf51b3ffc2926f944f Mon Sep 17 00:00:00 2001 From: Emmi Takkinen Date: Tue, 31 Mar 2020 12:19:28 +0300 Subject: [PATCH 1/2] 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 11cec6dd3c..cfff6b1f89 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 7169962c84..f051b4cd7b 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 @@ -635,7 +635,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 c53be22105..cdd5fd5bce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1079,7 +1079,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 d4d8597db6..4cff7f43e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -915,7 +915,7 @@ columns_settings_issues_table = [% ColumnsSettings.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