Bugzilla – Attachment 168737 Details for
Bug 28924
Allow checkout fine limit to be determined by patron category
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28924: (QA follow-up): Remove unnecessary template method
Bug-28924-QA-follow-up-Remove-unnecessary-template.patch (text/plain), 3.47 KB, created by
Nick Clemens (kidclamp)
on 2024-07-10 13:32:28 UTC
(
hide
)
Description:
Bug 28924: (QA follow-up): Remove unnecessary template method
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2024-07-10 13:32:28 UTC
Size:
3.47 KB
patch
obsolete
>From 08762dffd063a975239886301a1abe62644bc04a Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Fri, 14 Jun 2024 14:47:07 +0000 >Subject: [PATCH] Bug 28924: (QA follow-up): Remove unnecessary template method > >Sponsored-by: Cuyahoga County Public Library <https://cuyahogalibrary.org/> >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > Koha/Template/Plugin/Categories.pm | 6 ------ > koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc | 5 ++--- > .../intranet-tmpl/prog/en/includes/patron_messages.inc | 2 +- > .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +- > 4 files changed, 4 insertions(+), 11 deletions(-) > >diff --git a/Koha/Template/Plugin/Categories.pm b/Koha/Template/Plugin/Categories.pm >index 4b7c9c6e5dc..4d425d6f9ec 100644 >--- a/Koha/Template/Plugin/Categories.pm >+++ b/Koha/Template/Plugin/Categories.pm >@@ -45,12 +45,6 @@ sub can_any_reset_password { > : 0; > } > >-sub GetPatronCharges { >- my ( $self, $params ) = @_; >- my $charges = Koha::Patron->is_patron_inside_charge_limits({ borrowernumber => $params }); >- return $charges->{noissuescharge}; >-} >- > 1; > > =head1 NAME >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >index 3e103ff7709..42cbfb6cd7c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >@@ -1,10 +1,9 @@ > [% USE Price %] > [% USE Categories %] >-[% SET NoIssuesCharge = Categories.GetPatronCharges(borrowernumber) %] >-[% IF NoIssuesCharge.charge and NoIssuesCharge.charge > 0 %] >+[% IF NoIssuesCharge and NoIssuesCharge > 0 %] > <li> > <span class="circ-hlt">Charges:</span> >- <span>Patron has outstanding charges of [% NoIssuesCharge.charge | $Price %].</span> >+ <span>Patron has outstanding charges of [% NoIssuesCharge | $Price %].</span> > [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge.limit && NoIssuesCharge.overlimit %] > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >index 38a0fb7c5c4..6c87647b422 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc >@@ -119,7 +119,7 @@ > [% END %] > > [% IF ( charges ) %] >- [% INCLUDE 'blocked-fines.inc' borrowernumber = patron.borrowernumber %] >+ [% INCLUDE 'blocked-fines.inc' NoIssuesCharge = chargesamount %] > [% END %] > > [% IF ( charges_guarantors_guarantees ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index 3beb6d14aff..a51299356fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -63,7 +63,7 @@ > <div class="dialog alert"> > Cannot check out! > [% IF ( charges ) %] >- [% INCLUDE 'blocked-fines.inc' borrowernumber = patron.borrowernumber %] >+ [% INCLUDE 'blocked-fines.inc' NoIssuesCharge = chargesamount %] > [% END %] > [% IF ( charges_guarantors_guarantees ) %] > <li> >-- >2.39.2
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 28924
:
165870
|
165871
|
165872
|
165873
|
165874
|
165875
|
165876
|
166042
|
166043
|
166044
|
166045
|
166046
|
166047
|
166048
|
166171
|
166172
|
166173
|
166174
|
166175
|
166176
|
166177
|
167719
|
167720
|
167721
|
167722
|
167723
|
167724
|
167725
|
167726
|
167727
|
167728
|
167729
|
167730
|
167731
|
167732
|
167733
|
167734
|
167735
|
167736
|
167737
|
167738
|
167739
|
167740
|
168728
|
168729
|
168730
|
168731
|
168732
|
168733
|
168734
|
168735
|
168736
|
168737
|
168738
|
168984
|
168985
|
168986
|
168987
|
168988
|
168989
|
168990
|
168991
|
168992
|
168993
|
168994
|
168995
|
169177
|
169428