Attachment 90283 Details for Bug 18930 – Bug 18930: (follow-up) Amend Koha::RefundLostItemFeeRules->find

[patch] Bug 18930: (follow-up) Amend Koha::RefundLostItemFeeRules->find

Bug-18930-follow-up-Amend-KohaRefundLostItemFeeRul.patch (text/plain), 1.56 KB, created by Agustín Moyano on 2019-06-04 00:05:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Agustín Moyano

Created: 2019-06-04 00:05:18 UTC

Size: 1.56 KB

patch

obsolete

>From 1201c9bad2c691496bc2fcc8cd8946da5d06e5a2 Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Mon, 6 May 2019 23:11:09 -0300
>Subject: [PATCH] Bug 18930: (follow-up) Amend
> Koha::RefundLostItemFeeRules->find
>
>---
> Koha/RefundLostItemFeeRules.pm | 14 ++++++++++++++
> admin/smart-rules.pl           |  3 ++-
> 2 files changed, 16 insertions(+), 1 deletion(-)
>
>diff --git a/Koha/RefundLostItemFeeRules.pm b/Koha/RefundLostItemFeeRules.pm
>index b08ac1179d..207c61a7d3 100644
>--- a/Koha/RefundLostItemFeeRules.pm
>+++ b/Koha/RefundLostItemFeeRules.pm
>@@ -136,6 +136,20 @@ sub _choose_branch {
>     return $branch;
> }
> 
>+=head3 Koha::RefundLostItemFeeRules->find();
>+
>+Inherit from Koha::Objects->find(), but forces rule_name => 'refund'
>+
>+=cut
>+
>+sub find {
>+    my ( $self, @pars ) = @_;
>+
>+    $pars[0]->{rule_name} = 'refund';
>+
>+    return $self->SUPER::find(@pars);
>+}
>+
> =head3 _default_rule (internal)
> 
> This function returns the default rule defined for refunding lost
>diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
>index 1b03aed187..403f425e54 100755
>--- a/admin/smart-rules.pl
>+++ b/admin/smart-rules.pl
>@@ -539,7 +539,8 @@ elsif ( $op eq 'mod-refund-lost-item-fee-rule' ) {
>     }
> }
> 
>-my $refundLostItemFeeRule = Koha::RefundLostItemFeeRules->find({ branchcode => $branch });
>+my $refundLostItemFeeRule = Koha::RefundLostItemFeeRules->find({ branchcode => ($branch eq '*') ? undef:$branch });
>+
> $template->param(
>     refundLostItemFeeRule => $refundLostItemFeeRule,
>     defaultRefundRule     => Koha::RefundLostItemFeeRules->_default_rule
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 18930: 65243 | 71007 | 81101 | 81148 | 82937 | 82938 | 85492 | 85493 | 86169 | 86170 | 86171 | 89404 | 89405 | 89406 | 90280 | 90281 | 90282 | 90283 | 90284 | 90285 | 90541 | 90542 | 90543 | 90544 | 90545 | 90546 | 90547 | 90548 | 90549 | 91254 | 91255 | 91256 | 91257 | 91258 | 91259 | 91260