From 701890504a720a987e84e699458da6bdc57de618 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Wed, 2 Nov 2022 11:50:42 +0000
Subject: [PATCH] Bug 31713: (QA follow-up) Make credits positive

* This makes amount and amountoutstanding for credits positive
* Adapts the total line to read credits instead of due when the
  balance is >0

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 installer/data/mysql/atomicupdate/bug_31713.pl  | 15 +++++++++++----
 .../data/mysql/en/mandatory/sample_notices.yml  | 17 +++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/bug_31713.pl b/installer/data/mysql/atomicupdate/bug_31713.pl
index 13d608c7e6..c0deacdff7 100644
--- a/installer/data/mysql/atomicupdate/bug_31713.pl
+++ b/installer/data/mysql/atomicupdate/bug_31713.pl
@@ -82,8 +82,8 @@ return {
       [% PROCESS account_type_description account=credit %]
       [%- IF credit.description %], [% credit.description | html %][% END %]
     </td>
-    <td class='credit'>[% credit.amount | $Price %]</td>
-    <td class='credit'>[% credit.amountoutstanding | $Price %]</td>
+    <td class='credit'>[% credit.amount *-1 | $Price %]</td>
+    <td class='credit'>[% credit.amountoutstanding *-1 | $Price %]</td>
   </tr>
   [% END %]
   [% ELSE %]
@@ -94,8 +94,15 @@ return {
 
   <tfoot>
     <tr>
-      <td colspan='3'>Total outstanding dues as of [% today | $KohaDates  %]: </td>
-      [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% ELSE %]<td class='debit'>[% END %][% borrower.account.balance | $Price %]</td>
+      <td colspan='3'>
+        [% IF borrower.account.balance < 0 %]
+          Total credit as of [% today | $KohaDates %]:
+        [% ELSE %]
+          Total outstanding dues as of [% today | $KohaDates %]:
+        [% END %]
+      </td>
+      [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% borrower.account.balance * -1 | $Price %]</td>
+      [% ELSE %]<td class='debit'>[% borrower.account.balance | $Price %]</td>[% END %]
     </tr>
   </tfoot>
 </table>
diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index 09b594a759..ed55b289b9 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -1366,8 +1366,8 @@ tables:
             - "      [% PROCESS account_type_description account=credit %]"
             - "      [%- IF credit.description %], [% credit.description | html %][% END %]"
             - "    </td>"
-            - "    <td class='credit'>[% credit.amount | $Price %]</td>"
-            - "    <td class='credit'>[% credit.amountoutstanding | $Price %]</td>"
+            - "    <td class='credit'>[% credit.amount *-1 | $Price %]</td>"
+            - "    <td class='credit'>[% credit.amountoutstanding *-1 | $Price %]</td>"
             - "  </tr>"
             - "  [% END %]"
             - "  [% ELSE %]"
@@ -1377,10 +1377,15 @@ tables:
             - "  [% END %]"
             - ""
             - "  <tfoot>"
-            - "    <tr>"
-            - "      <td colspan='3'>Total outstanding dues as of [% today | $KohaDates %]: </td>"
-            - "      [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% ELSE %]<td class='debit'>[% END %][% borrower.account.balance | $Price %]</td>"
-            - "    </tr>"
+            - "    <td colspan='3'>"
+            - "      [% IF borrower.account.balance < 0 %]"
+            - "        Total credit as of [% today | $KohaDates %]:"
+            - "      [% ELSE %]"
+            - "        Total outstanding dues as of [% today | $KohaDates %]:"
+            - "      [% END %]"
+            - "    </td>"
+            - "    [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% borrower.account.balance * -1 | $Price %]</td>"
+            - "    [% ELSE %]<td class='debit'>[% borrower.account.balance | $Price %]</td>[% END %]"
             - "  </tfoot>"
             - "</table>"
 
-- 
2.39.5