From febd2aa794ee26ad413b1f8914762edd51802967 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 17 May 2021 08:17:14 +0100
Subject: [PATCH] Bug 22435: Alternative Three - Account Details

Another alternative to try, feedback welcome.

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
---
 .../en/modules/members/accountline-details.tt | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
index 502b6a78a0..c6e9fb6285 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt
@@ -7,7 +7,7 @@
 [% SET footerjs = 1 %]
 [% PROCESS 'accounts.inc' %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Details of fee &rsaquo; [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
+<title>Details of [% IF type == 'credit' %]credit[% ELSE %]debit[% END %] &rsaquo; [% INCLUDE 'patron-title.inc' no_html = 1 %] &rsaquo; Patrons &rsaquo; Koha</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -24,24 +24,27 @@
             <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
         </li>
 
-        [% IF type == 'credit' %]
+
+        [% IF accountline %]
+            [% IF accountline.credit_type_code %]
             <li>
                 <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account for [% INCLUDE 'patron-title.inc' %]</a>
             </li>
             <li>
                 <a href="#" aria-current="page">
-                    Details of payment
+                    Details of credit ([% accountline.id | html %])
                 </a>
             </li>
-        [% ELSIF type == 'debit' %]
+            [% ELSIF accountline.debit_type_code %]
             <li>
                 <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account for [% INCLUDE 'patron-title.inc' %]</a>
             </li>
             <li>
                 <a href="#" aria-current="page">
-                    Details of fee
+                    Details of debit ([% accountline.id | html %])
                 </a>
             </li>
+            [% END %]
         [% ELSE %]
             <li>
                 <a href="#" aria-current="page">
@@ -61,16 +64,16 @@
 
             [% IF accountline %]
                 [% IF accountline.credit_type_code %]
-                    <h2>Details of payment</h2>
+                    <h2>Details of credit</h2>
                 [% ELSIF accountline.debit_type_code %]
-                    <h2>Details of fee</h2>
+                    <h2>Details of debit</h2>
                 [% END %]
 
                 <table id="table_account_fines">
                     <thead>
                         <tr>
                             <th>Date</th>
-                            <th>Description of charges</th>
+                            <th>Description</th>
                             <th>Barcode</th>
                             <th>Due date</th>
                             <th>Return date</th>
@@ -83,7 +86,7 @@
                     <tbody>
                         <tr>
                             <td>
-                                [% accountline.date |$KohaDates %]
+                                [% accountline.date | $KohaDates %]
                             </td>
                             <td>
                                 [%- PROCESS account_type_description account=accountline -%]
@@ -138,11 +141,17 @@
                 <table class="accountline-offsets-table" id="accountline-debits-table">
                     <thead>
                         <tr>
-                            <th>Date</th>
-                            <th>Change</th>
-                            <th>Action</th>
-                            <th>Relation</th>
-                            <th>Transacting librarian</th>
+                            <th rowspan="2">Date</th>
+                            <th colspan="2">Change</th>
+                            <th rowspan="2">Action</th>
+                            <th colspan="4">Related transaction</th>
+                        </tr>
+                        <tr>
+                            <th>Increase</th>
+                            <th>Decrease</th>
+                            <th>Type</th>
+                            <th>Amount</th>
+                            <th>Librarian</th>
                             <th>Note</th>
                         </tr>
                     </thead>
@@ -167,14 +176,17 @@
 
                                 <tr>
                                     <td>[% ao.created_on | $KohaDates with_hours => 1%]</td>
-                                    <td>[% ao.amount | $Price %]</td>
+                                    <td>[%- IF ao.amount > 0 -%][% ao.amount | $Price %][% END %]</td>
+                                    <td>[%- IF ao.amount < 0 -%][% ao.amount | $Price %][% END %]</td>
                                     <td>
                                         [% PROCESS ao_description ao=ao %]
                                     </td>
+                                    [%- IF offset_accountline -%]
                                     <td>
-                                        [%- IF offset_accountline -%]
                                         [% PROCESS account_type_description account=offset_accountline %] (<a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]">[% offset_accountline.id | html %]</a>)
-                                        [%- END -%]
+                                    </td>
+                                    <td>
+                                        [% offset_accountline.amount | $Price %]
                                     </td>
                                     <td>
                                         [% IF offset_accountline.manager_id %]
@@ -187,6 +199,11 @@
                                         </a>
                                         [% END %]
                                     </td>
+                                    [%- ELSE -%]
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    [%- END -%]
                                     <td>[% offset_accountline.note | html %]</td>
                                 </tr>
                         [% END %]
-- 
2.32.0