Bugzilla – Attachment 186014 Details for
Bug 23415
Notify patron fines when renewing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23415: Fix QA issues
0001-Bug-23415-Fix-QA-issues.patch (text/plain), 4.56 KB, created by
Emmi Takkinen
on 2025-09-01 11:18:30 UTC
(
hide
)
Description:
Bug 23415: Fix QA issues
Filename:
MIME Type:
Creator:
Emmi Takkinen
Created:
2025-09-01 11:18:30 UTC
Size:
4.56 KB
patch
obsolete
>From abd3a89a5e5faef011c8488da9291cf3909fba1c Mon Sep 17 00:00:00 2001 >From: Emmi Takkinen <emmi.takkinen@koha-suomi.fi> >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 <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=LOST">LOST</a> 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 @@ > > <li>The patron has a debt of [% balance | $Price %].</li> > <form method="post" action="/cgi-bin/koha/circ/renew.pl"> >+ [% INCLUDE 'csrf-token.inc' %] > <input type="hidden" name="barcode" value="[% item.barcode | html %]"/> > <input type="hidden" name="override_debt" value="1" /> >+ <input type="hidden" name="op" value="cud-renew" /> > <button type="submit" class="approve"><i class="fa fa-check"></i>Renew checkout(s)</button> > </form> > [% 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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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
|
185270
|
185271
|
185272
|
185273
|
185274
|
185275
| 186014