X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fsmart-rules.pl;h=b71179437fe8d45aeb554c79a8f7f2b5b4be6d6b;hb=0ec29e5d4ecdf5dd3156b53320eac1250d065e3b;hp=7c3b5b86aeb271e2714cf4397ce71f94ec652086;hpb=98f50491bd35e9dbda522cf2b7028e15f7a64d13;p=koha-ffzg.git

diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 7c3b5b86ae..b71179437f 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -654,6 +654,31 @@ elsif ( $op eq 'mod-refund-lost-item-fee-rule' ) {
             }
         );
     }
+
+    my $processingreturn = $input->param('processingreturn');
+
+    if ( $processingreturn eq '*' ) {
+        if ( $branch ne '*' ) {
+            # only do something for $processingreturn eq '*' if branch-specific
+            Koha::CirculationRules->set_rules(
+                {
+                    branchcode   => $branch,
+                    rules        => {
+                        processingreturn => undef
+                    }
+                }
+            );
+        }
+    } else {
+        Koha::CirculationRules->set_rules(
+            {
+                branchcode   => $branch,
+                rules        => {
+                    processingreturn => $processingreturn
+                }
+            }
+        );
+    }
 } elsif ( $op eq "set-waiting-hold-cancellation" ) {
 
     my $category = $input->param('waiting_hold_cancellation_category');
@@ -691,9 +716,13 @@ elsif ( $op eq 'mod-refund-lost-item-fee-rule' ) {
 
 my $refundLostItemFeeRule = Koha::CirculationRules->find({ branchcode => ($branch eq '*') ? undef : $branch, rule_name => 'lostreturn' });
 my $defaultLostItemFeeRule = Koha::CirculationRules->find({ branchcode => undef, rule_name => 'lostreturn' });
+my $refundProcessingFeeRule = Koha::CirculationRules->find({ branchcode => ($branch eq '*') ? undef : $branch, rule_name => 'processingreturn' });
+my $defaultProcessingFeeRule = Koha::CirculationRules->find({ branchcode => undef, rule_name => 'processingreturn' });
 $template->param(
     refundLostItemFeeRule => $refundLostItemFeeRule,
-    defaultRefundRule     => $defaultLostItemFeeRule ? $defaultLostItemFeeRule->rule_value : 'refund'
+    defaultRefundRule     => $defaultLostItemFeeRule ? $defaultLostItemFeeRule->rule_value : 'refund',
+    refundProcessingFeeRule => $refundProcessingFeeRule,
+    defaultProcessingRefundRule => $defaultProcessingFeeRule ? $defaultProcessingFeeRule->rule_value : 'refund',
 );
 
 my $patron_categories = Koha::Patron::Categories->search({}, { order_by => ['description'] });