From 922064568d9ad1a7737df4142d638498652782ce Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 13 Jun 2019 10:02:35 +0100
Subject: [PATCH] Bug 23106: Tweak display of totals on payment page

This patch tweaks the display of totals on the fines payments page to
clarify between the totals before and after applying credits.

Test Plan:
1) Add some debts and credits to a patrons account
2) Look at the pay page before applying the patch
3) Look at the pay page after applying the patch
4) Verify the new layout is an improvment or not

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 7c5e7ca9c47ac6c8a8b7d89da46e7354d8fea69d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/members/pay.tt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index 10796dd9f0..96d0d41699 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -116,11 +116,19 @@
 </tbody>
 
 <tfoot>
+    <tr>
+        <td class="total" colspan="10">Total due:</td>
+        <td style="text-align: right;">[% total | $Price %]</td>
+    </tr>
     [% IF outstanding_credits.total_outstanding < 0 %]
         <tr>
             <td class="total" colspan="10">Outstanding credits could be applied: </td>
             <td class="credit" style="text-align: right;"><button type="submit" id="apply_credits" name="apply_credits" value="apply_credits" class="btn btn-default btn-sm">Apply <strong class="credit">[% outstanding_credits.total_outstanding | $Price %]</strong></button></td>
         </tr>
+        <tr>
+            <td class="total" colspan="10">Total due if credit applied:</td>
+            <td style="text-align: right;">[% total + outstanding_credits.total_outstanding | $Price %]</td>
+        </tr>
     [% END %]
     [% IF ( account_grp.total ) %]
         <tr>
@@ -128,14 +136,6 @@
             <td style="text-align: right;">[% account_grp.total | $Price %]</td>
         </tr>
     [% END %]
-    <tr>
-        <td class="total" colspan="10">Total due:</td>
-        [% IF outstanding_credits.total_outstanding < 0 %]
-            <td style="text-align: right;">[% total + outstanding_credits.total_outstanding | $Price %]</td>
-        [% ELSE %]
-            <td style="text-align: right;">[% total | $Price %]</td>
-        [% END %]
-    </tr>
 </tfoot>
 
 </table>
-- 
2.39.5