From abd3a89a5e5faef011c8488da9291cf3909fba1c Mon Sep 17 00:00:00 2001 From: Emmi Takkinen Date: Mon, 1 Sep 2025 13:22:51 +0300 Subject: [PATCH] Bug 23415: Fix QA issues --- C4/Circulation.pm | 7 ++++--- .../prog/en/modules/admin/preferences/circulation.pref | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 2 ++ .../intranet-tmpl/prog/en/modules/members/moremember.tt | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 8878e771a9..618127cd5c 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -3216,9 +3216,10 @@ sub CanBookBeRenewed { || ( $issue->is_overdue and $overduesblockrenewing eq 'blockitem' ) ) { return ( 0, 'overdue' ); - } elsif ( $finesblockrenewing && $balance > $finesblockrenewing && !$allowfineoverriderenewing ) { - return ( 0, 'too_much_oweing'); - } +} +elsif ( $finesblockrenewing && $balance > $finesblockrenewing && !$allowfineoverriderenewing ) { + return ( 0, 'too_much_oweing' ); +} } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 626ac80b71..f801ad755a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -571,7 +571,7 @@ Circulation: - Only allow patrons or staff to renew items if patron has less than - pref: FineNoRenewals class: currency - - [% local_currency %] in fines (leave blank to disable). + - '[% local_currency %] in fines (leave blank to disable).' Lost item policy: - - By default, set the LOST value of an item to 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 26717109e5..15ef23a477 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1137,7 +1137,8 @@ var amountlimit = "[% Koha.Preference('FineNoRenewals') | html %]"; var fines = "[% fines | $Price %]"; - var MSG_CONFIRM_RENEW = _("The patron has a debt of %s\nAre you sure you want to renew checkout(s)?").format(fines); + var MSG_CONFIRM_RENEW = _("The patron has a debt of %s").format(fines); + MSG_CONFIRM_RENEW += _("Are you sure you want to renew checkout(s)?"); // On-site checkout function toggle_onsite_checkout(){ 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 434b2435a4..1fd3131f26 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -142,8 +142,10 @@
  • The patron has a debt of [% balance | $Price %].
  • + [% INCLUDE 'csrf-token.inc' %] +
    [% ELSIF error == "on_reserve" %] 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 819344051f..27b7addfbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -809,7 +809,8 @@ var amountlimit = "[% Koha.Preference('FineNoRenewals') | html %]"; var fines = "[% fines | $Price %]"; - var MSG_CONFIRM_RENEW = _("The patron has a debt of %s\n Are you sure you want to renew checkout(s)?").format(fines); + var MSG_CONFIRM_RENEW = _("The patron has a debt of %s").format(fines); + MSG_CONFIRM_RENEW += _("Are you sure you want to renew checkout(s)?"); function uncheck_sibling(me){ nodename=me.getAttribute("name"); -- 2.34.1