From 9608f3e0ae0c23f2b9c9d1832d9a3e4fa02a051d Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 22 Apr 2025 16:58:07 +0100 Subject: [PATCH] Bug 38532: (follow-up) Use Koha::Patron->account methods Update the patch to use Koha::Account and it's associated 'outstanding' methods to ensure we accurately portray outstanding amounts rather than 'all credits' totals. I also remove the unused `$balance` variable from the members/moremember.pl controller. --- circ/circulation.pl | 5 +++-- members/moremember.pl | 8 ++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 034a6a6969c..43ee3dbe1ba 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -627,8 +627,7 @@ if ($patron) { $template->param( is_anonymous => 1 ); $noissues = 1; } - my $lines = Koha::Account::Lines->search( { borrowernumber => $patron->id } ); - my $credits_balance = $lines->credits_total; + my $patron_charge_limits = $patron->is_patron_inside_charge_limits(); if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) { my $noissuescharge = @@ -640,6 +639,8 @@ if ($patron) { chargesamount => $patron_charge_limits->{noissuescharge}->{charge}, ); } + + my $credits_balance = $patron->account->outstanding_credits->total_outstanding; if ( $credits_balance < 0 ) { $template->param( credits => 1, diff --git a/members/moremember.pl b/members/moremember.pl index 08c2f1a5826..2c7a32b88b2 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -235,12 +235,6 @@ if ( $patron->has_overdues ) { } my $issues = $patron->checkouts; -my $balance = 0; -$balance = $patron->account->balance; - -my $lines = Koha::Account::Lines->search( { borrowernumber => $patron->id } ); -my $credits_balance = $lines->credits_total; - my $patron_charge_limits = $patron->is_patron_inside_charge_limits(); if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) { $template->param( @@ -248,6 +242,8 @@ if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) { chargesamount => $patron_charge_limits->{noissuescharge}->{charge}, ); } + +my $credits_balance = $patron->account->outstanding_credits->total_outstanding; if ( $credits_balance < 0 ) { $template->param( credits => 1, -- 2.49.0