Attachment 130469 Details for Bug 29385 – Bug 29385: Catch register_id for payments against fees

[patch] Bug 29385: Catch register_id for payments against fees

Bug-29385-Catch-registerid-for-payments-against-fe.patch (text/plain), 2.58 KB, created by Kyle M Hall (khall) on 2022-02-10 19:11:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2022-02-10 19:11:23 UTC

Size: 2.58 KB

patch

obsolete

>From b790f27efc4d305f13cbc655da818c01be8973cc Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 2 Dec 2021 13:52:45 +0100
>Subject: [PATCH] Bug 29385: Catch register_id for payments against fees
>
>This patch refactors the pay method in SIP FeePayment such that we
>consistently pass parameters to both invocations of Koha::Account->pay.
>
>It ensure the missing cash_register definition is passed when a set of
>account lines to pay is defined.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> C4/SIP/ILS/Transaction/FeePayment.pm | 41 +++++++++-------------------
> 1 file changed, 13 insertions(+), 28 deletions(-)
>
>diff --git a/C4/SIP/ILS/Transaction/FeePayment.pm b/C4/SIP/ILS/Transaction/FeePayment.pm
>index 7748b1a1d8..287d171ff1 100644
>--- a/C4/SIP/ILS/Transaction/FeePayment.pm
>+++ b/C4/SIP/ILS/Transaction/FeePayment.pm
>@@ -57,22 +57,17 @@ sub pay {
>         return { ok => 0 } if $account->balance < $amt;
>     }
> 
>+    my $pay_options = {
>+        amount       => $amt,
>+        type         => $type,
>+        payment_type => 'SIP' . $sip_type,
>+        interface    => C4::Context->interface
>+    };
>+
>     if ($fee_id) {
>         my $fee = Koha::Account::Lines->find($fee_id);
>         if ( $fee ) {
>-            my $pay_response = $account->pay(
>-                {
>-                    amount       => $amt,
>-                    type         => $type,
>-                    payment_type => 'SIP' . $sip_type,
>-                    lines        => [$fee],
>-                    interface    => C4::Context->interface
>-                }
>-            );
>-            return {
>-                ok           => 1,
>-                pay_response => $pay_response
>-            };
>+            $pay_options->{lines} = [$fee];
>         }
>         else {
>             return {
>@@ -80,21 +75,11 @@ sub pay {
>             };
>         }
>     }
>-    else {
>-        my $pay_response = $account->pay(
>-            {
>-                amount        => $amt,
>-                type          => $type,
>-                payment_type  => 'SIP' . $sip_type,
>-                interface     => C4::Context->interface,
>-                cash_register => $register_id
>-            }
>-        );
>-        return {
>-            ok           => 1,
>-            pay_response => $pay_response
>-        };
>-    }
>+    my $pay_response = $account->pay($pay_options);
>+    return {
>+        ok           => 1,
>+        pay_response => $pay_response
>+    };
> }
> 
> #sub DESTROY {
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 29385: 127173 | 127178 | 128159 | 129583 | 130469 | 130595