Attachment 139704 Details for Bug 29987 – Bug 29987: (follow-up) Fix missing payment type

[patch] Bug 29987: (follow-up) Fix missing payment type

Bug-29987-follow-up-Fix-missing-payment-type.patch (text/plain), 2.92 KB, created by Martin Renvoize (ashimema) on 2022-08-24 10:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-08-24 10:25:06 UTC

Size: 2.92 KB

patch

obsolete

>From b0acadabce3d91e50f1cf2110a3e6936a1a02ed6 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Wed, 24 Aug 2022 11:23:25 +0100
>Subject: [PATCH] Bug 29987: (follow-up) Fix missing payment type
>
>The payment type include has changed since the patch was first written,
>we now require a 'type' is passed to properly set the field name.
>
>This should fix the 'bankable' issue raised.
>---
> .../prog/en/modules/members/mancredit.tt             |  2 +-
> members/mancredit.pl                                 | 12 ++++++------
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>index 1cf63ebe11..255f299096 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>@@ -71,7 +71,7 @@
>                             <li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
>                             <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
>                             <li><label for="amount">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
>-                            [% INCLUDE 'transaction_types.inc' %]
>+                            [% INCLUDE 'transaction_types.inc' type="credit" %]
>                             [% IF Koha.Preference('UseCashRegisters') %]
>                             <li>
>                                 [% IF Koha.Preference('RequireCashRegister') %]
>diff --git a/members/mancredit.pl b/members/mancredit.pl
>index 68abdc3022..e8860b7ca9 100755
>--- a/members/mancredit.pl
>+++ b/members/mancredit.pl
>@@ -85,11 +85,11 @@ if ($add) {
>         my $item = Koha::Items->find( { barcode => $barcode } );
>         $item_id = $item->itemnumber if $item;
>     }
>-    my $description  = $input->param('desc');
>-    my $note         = $input->param('note');
>-    my $amount       = $input->param('amount') || 0;
>-    my $type         = $input->param('type');
>-    my $payment_type = $input->param('payment_type');
>+    my $description      = $input->param('desc');
>+    my $note             = $input->param('note');
>+    my $amount           = $input->param('amount') || 0;
>+    my $type             = $input->param('type');
>+    my $credit_type      = $input->param('credit_type');
>     my $cash_register_id = $input->param('cash_register');
> 
>     $patron->account->add_credit(
>@@ -102,7 +102,7 @@ if ($add) {
>             type          => $type,
>             user_id       => $logged_in_user->id,
>             interface     => C4::Context->interface,
>-            payment_type  => $payment_type,
>+            payment_type  => $credit_type,
>             cash_register => $cash_register_id
>         }
>     );
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29987: 136743 | 136755 | 139703 | 139704 | 139705 | 141165 | 141166 | 141167 | 141171 | 141469 | 141470 | 141471 | 141472 | 142321 | 142322 | 142323 | 142324 | 142325