From 7a53fbbc4575501cc80e70d2acceb908ce1191b2 Mon Sep 17 00:00:00 2001
From: Andrew Fuerste Henry <andrew@bywatersolutions.com>
Date: Tue, 26 Nov 2024 18:23:14 +0000
Subject: [PATCH] Bug 38532: show both debits and credits in patron_messages

To test:
1: Have patrons with a variety of credit/debit combinations
2: Confirm Koha shows the total debit amount in patron_messages if any debits exist
3: Confirm Koha does not show anything about creditd in patron_messages if any debits exist
4: Apply patch, restart_all
5: Confirm all patrons show both debit total and credit total
---
 circ/circulation.pl                                       | 7 +++++--
 .../intranet-tmpl/prog/en/includes/patron_messages.inc    | 2 +-
 members/moremember.pl                                     | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 968470e6f1..820204fb8f 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -626,6 +626,8 @@ 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 =
@@ -636,10 +638,11 @@ if ($patron) {
             charges       => 1,
             chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
         );
-    } elsif ( $balance < 0 ) {
+    }
+    if ( $credits_balance < 0 ) {
         $template->param(
             credits       => 1,
-            creditsamount => -$balance,
+            creditsamount => -$credits_balance,
         );
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
index 99ce12b078..6d93cf506f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -150,7 +150,7 @@
 
         [% IF ( credits ) %]
             <li class="credits">
-                <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %]
+                <span class="circ-hlt">Credits:</span> Patron has outstanding credits[% IF ( creditsamount ) %] of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %]
             </li>
         [% END %]
         [% IF (noissues && CAN_user_circulate_force_checkout && !moremember) %]
diff --git a/members/moremember.pl b/members/moremember.pl
index 773bc4190d..96d8271fb1 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -242,16 +242,20 @@ 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(
         charges       => 1,
         chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
     );
-} elsif ( $balance < 0 ) {
+} 
+if ( $credits_balance < 0 ) {
     $template->param(
         credits       => 1,
-        creditsamount => -$balance,
+        creditsamount => -$credits_balance,
     );
 }
 
-- 
2.39.5