Attachment 156844 Details for Bug 16223 – Bug 16223: (QA follow-up) Move trigger to apply

[patch] Bug 16223: (QA follow-up) Move trigger to apply

Bug-16223-QA-follow-up-Move-trigger-to-apply.patch (text/plain), 1.92 KB, created by Tomás Cohen Arazi (tcohen) on 2023-10-11 15:10:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2023-10-11 15:10:55 UTC

Size: 1.92 KB

patch

obsolete

>From 1784dd6856c10132292eb58ea73a7094c7feb429 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 11 Nov 2022 09:54:05 +0000
>Subject: [PATCH] Bug 16223: (QA follow-up) Move trigger to apply
>
>This patch moves the del_restrictions_after_payment from before the
>actual credit application call inside Koha::Account::pay to after the
>application of credits to debits in Koha::Account::Line::apply.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> Koha/Account.pm      | 3 ---
> Koha/Account/Line.pm | 3 +++
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/Koha/Account.pm b/Koha/Account.pm
>index b6bd357b165..ad08a6df4b7 100644
>--- a/Koha/Account.pm
>+++ b/Koha/Account.pm
>@@ -39,7 +39,6 @@ use Koha::Account::DebitTypes;
> use Koha::Exceptions;
> use Koha::Exceptions::Account;
> use Koha::Plugins;
>-use Koha::Patron::Debarments;
> 
> =head1 NAME
> 
>@@ -118,8 +117,6 @@ sub pay {
>         }
>     );
> 
>-    Koha::Patron::Debarments::del_restrictions_after_payment({ borrowernumber => $self->{patron_id} });
>-
>     # NOTE: Pay historically always applied as much credit as it could to all
>     # existing outstanding debits, whether passed specific debits or otherwise.
>     if ( $payment->amountoutstanding ) {
>diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm
>index e6368dc9cda..0c35d497cb2 100644
>--- a/Koha/Account/Line.pm
>+++ b/Koha/Account/Line.pm
>@@ -28,6 +28,7 @@ use Koha::Database;
> use Koha::DateUtils qw( dt_from_string );
> use Koha::Exceptions::Account;
> use Koha::Items;
>+use Koha::Patron::Debarments;
> 
> use base qw(Koha::Object Koha::Object::Mixin::AdditionalFields);
> 
>@@ -699,6 +700,8 @@ sub apply {
>         }
>     });
> 
>+    Koha::Patron::Debarments::del_restrictions_after_payment({ borrowernumber => $self->borrowernumber });
>+
>     return $self;
> }
> 
>-- 
>2.42.0

Actions: View | Diff | Splinter Review

Attachments on bug 16223: 50078 | 50084 | 99697 | 99698 | 104399 | 104400 | 114272 | 114273 | 118526 | 118572 | 118574 | 118575 | 122768 | 122769 | 127252 | 128005 | 132284 | 132285 | 132286 | 132287 | 143388 | 143389 | 143390 | 143462 | 143670 | 143671 | 143672 | 143688 | 143689 | 143690 | 143765 | 143766 | 143767 | 143768 | 143769 | 143770 | 143936 | 146051 | 146052 | 146053 | 146054 | 146055 | 146056 | 146057 | 148307 | 148308 | 148309 | 148310 | 148311 | 148312 | 148313 | 150024 | 150025 | 150026 | 150027 | 150028 | 150029 | 153024 | 153025 | 153026 | 153027 | 153028 | 153029 | 155644 | 155645 | 155646 | 155647 | 155648 | 155649 | 155650 | 156841 | 156842 | 156843 | 156844 | 156845 | 156846 | 156847 | 156848 | 156849 | 156850