Attachment 168521 Details for Bug 19336 – Bug 19336: (QA follow-up) Using CirculationRules instead of IssuingRules

[patch] Bug 19336: (QA follow-up) Using CirculationRules instead of IssuingRules

Bug-19336-QA-follow-up-Using-CirculationRules-inst.patch (text/plain), 2.23 KB, created by Chris Cormack on 2024-07-04 21:48:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2024-07-04 21:48:42 UTC

Size: 2.23 KB

patch

obsolete

>From 2968dc4c0dcf38afb462aa023cecce9f6ffc07c2 Mon Sep 17 00:00:00 2001
>From: Alexis Ripetti <alexis.ripetti@inLibro.com>
>Date: Fri, 27 Aug 2021 09:39:05 -0400
>Subject: [PATCH] Bug 19336: (QA follow-up) Using CirculationRules instead of
> IssuingRules
>
>Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
>---
> misc/cronjobs/fines.pl | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/misc/cronjobs/fines.pl b/misc/cronjobs/fines.pl
>index dca99d92a7c..a64bb151860 100755
>--- a/misc/cronjobs/fines.pl
>+++ b/misc/cronjobs/fines.pl
>@@ -38,7 +38,7 @@ use Carp qw( carp croak );
> use File::Spec;
> use Try::Tiny qw( catch try );
> 
>-use Koha::IssuingRules;
>+use Koha::CirculationRules;
> use Koha::Calendar;
> use Koha::DateUtils qw( dt_from_string output_pref );
> use Koha::Patrons;
>@@ -158,17 +158,17 @@ for my $overdue ( @{$overdues} ) {
>     my ( $amount, $unitcounttotal, $unitcount);
>     if ( defined($maxfinesdays) && $maxfinesdays <= $datedue->delta_days( $today )->in_units( 'days' ) ) {
>         my $itype = $overdue->{itemtype} || $overdue->{itype};
>-        my $data = Koha::IssuingRules->get_effective_issuing_rule( { categorycode => $borrower->{categorycode}, itemtype => $itype, branchcode => $branchcode } );
>-        if ( defined($data->overduefinescap) ) {
>-            $amount = $data->overduefinescap;
>+        my $data = Koha::CirculationRules->get_effective_rule( { rule_name => 'overduefinescap', categorycode => $patron->categorycode, itemtype => $itype, branchcode => $branchcode } );
>+        if ( defined($data->rule_value) ) {
>+            $amount = $data->rule_value;
>             $unitcount = 'n/a';
>         }
>         else {
>-            print "No overduefinescap defined for {branchcode = $branchcode, itemtype = $itype and categorycode = $borrower->{categorycode}}\n";
>+            print "No overduefinescap defined for {branchcode = $branchcode, itemtype = $itype and categorycode = $patron->categorycode}\n";
>         }
>     }
>     if (!$amount) {
>-        ( $amount, $unitcounttotal, $unitcount ) = CalcFine( $overdue, $borrower->{categorycode}, $branchcode, $datedue, $today );
>+        ( $amount, $unitcounttotal, $unitcount ) = CalcFine( $overdue, $patron->categorycode, $branchcode, $datedue, $today );
>     }
> 
> 
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 19336: 67191 | 68318 | 68335 | 68336 | 75379 | 75380 | 75381 | 85914 | 85915 | 85916 | 85917 | 85918 | 85919 | 85920 | 85921 | 85922 | 85923 | 124197 | 124198 | 124199 | 124200 | 124201 | 153504 | 153505 | 153506 | 153507 | 153508 | 168517 | 168518 | 168519 | 168520 | 168521 | 172982 | 172983 | 172984 | 172985 | 172986 | 172987