From b325ba2cd9c45c3483eec3fa42bd4d74a722c3c0 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 21 Nov 2018 13:40:35 +0000
Subject: [PATCH] Bug 21491: Display 'Yes' as selected if no refundlostitemfee
 rules are set

To test:
1 - Delete all refund_lost_item_fee_rules form the db
    delete from refund_lost_item_fee_rules;
2 - View the Standard circ rules - Default lost item fee refund shows as
'No'
3 - View circ rules for a single library, shows as 'Default (Yes)'
4 - Return a lost item, it actually does refund (this is in the
        LostItemFeeRules code, default 1 if not set)
5 - Apply patch
6 - Rule shows as 'Yes'
7 - View a specifc rule, still says Default (Yes)
---
 admin/smart-rules.pl                                         | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index fcb5b7efb1..ca83cedfbe 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -539,6 +539,7 @@ elsif ( $op eq 'mod-refund-lost-item-fee-rule' ) {
 }
 
 my $refundLostItemFeeRule = Koha::RefundLostItemFeeRules->find({ branchcode => $branch });
+warn Data::Dumper::Dumper($refundLostItemFeeRule );
 $template->param(
     refundLostItemFeeRule => $refundLostItemFeeRule,
     defaultRefundRule     => Koha::RefundLostItemFeeRules->_default_rule
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index f97b2cf42e..f42a63ba80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -590,14 +590,14 @@
                         <select name="refund">
                           [#% Default branch %#]
                           [% IF ( current_branch == '*' ) %]
-                            [% IF ( refundLostItemFeeRule.refund ) %]
+                            [% IF ( ( not refundLostItemFeeRule.refund.defined ) || refundLostItemFeeRule.refund ) %]
                             <option value="1" selected="selected">
                             [% ELSE %]
                             <option value="1">
                             [% END %]
                                 Yes
                             </option>
-                            [% IF ( not refundLostItemFeeRule.refund ) %]
+                            [% IF ( refundLostItemFeeRule.refund.defined && ( not refundLostItemFeeRule.refund ) ) %]
                             <option value="0" selected="selected">
                             [% ELSE %]
                             <option value="0">
-- 
2.11.0