From 0261a5417510a25c493b4d097d707069827b7c58 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
Content-Type: text/plain; charset=utf-8

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>
---
 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 b6bd357b16..ad08a6df4b 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 e6368dc9cd..0c35d497cb 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.30.2