From d816e371ecba064f6e9418439a40d160f01aa924 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 26 Mar 2020 21:17:42 +0000
Subject: [PATCH] Bug 24995: Add issuedate to table_account_fines and finest

TO TEST:
1. Have a patron with some fines on an item. Try accruing fines.
2. Go to the accounting tab and look at both the Tranaction tab and Make a payment Tab
3. No Issue Date
4. Apply patch
5. Check those tabs again and see the issue date displays.
6. Go to column configuration and try to hide the issuedate, make sure it hides properly. Try this for both tables. Also make sure other columns hide properly.
7. Sign off!

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
---
 admin/columns_settings.yml                           |  4 ++++
 .../prog/en/modules/members/boraccount.tt            |  6 ++++--
 .../intranet-tmpl/prog/en/modules/members/pay.tt     | 12 +++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 2a2a1febe7..e9f306a324 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -490,6 +490,8 @@ modules:
           columnname: date_due
         -
           columnname: returndate
+        -
+          columnname: issuedate
         -
           columnname: note
         -
@@ -527,6 +529,8 @@ modules:
           columnname: date_due
         -
           columnname: returndate
+        -
+          columnname: issuedate
         -
           columnname: note
         -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
index 5b18dd039a..cb9467e784 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -49,6 +49,7 @@
           <th>Barcode</th>
           <th>Due date</th>
           <th>Return date</th>
+          <th>Issue date</th>
           <th>Home library</th>
           <th>Note</th>
           <th>Amount</th>
@@ -70,6 +71,7 @@
       <td>[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% account.itemnumber | uri %]&amp;biblionumber=[% account.item.biblionumber | uri %]#item[% account.itemnumber | uri %]">[% account.item.barcode | html %]</a>[% END %]</td>
       <td>[% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %]</td>
       <td>[% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %]</td>
+      <td>[% IF ( account.issue_id ) %][% account.checkout.issuedate | $KohaDates %][% END %]</td>
       <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td>
       <td>[% account.note | html_line_break %]</td>
       [% IF account.amount <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td>
@@ -93,7 +95,7 @@
   [% END %]
 <tfoot>
   <tr>
-    <td colspan="9">Total due</td>
+    <td colspan="10">Total due</td>
     [% IF ( totalcredit ) %]
         <td class="credit" style="text-align: right;">[% total | $Price %]</td>
     [% ELSE %]
@@ -149,7 +151,7 @@
                     var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408
                     $(this).html('<i class="fa fa-filter"></i> '+txtInactivefilter);
                 }
-                table_account_fines.fnFilter(filteredValue, 9, true, false);
+                table_account_fines.fnFilter(filteredValue, 10, true, false);
                 $(this).toggleClass('filtered');
             });
 
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 a4e4568a06..ebdd2c0e1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -51,6 +51,7 @@
     <th>Barcode</th>
     <th>Due date</th>
     <th>Return date</th>
+    <th>Issue date</th>
     <th class="NoSort">Payment note</th>
     <th>Amount</th>
     <th>Amount outstanding</th>
@@ -105,6 +106,11 @@
             [% line.checkout.returndate | $KohaDates with_hours => 1 %]
         [% END %]
     </td>
+    <td>
+        [% IF line.issue_id %]
+            [% line.checkout.issuedate | $KohaDates %]
+        [% END %]
+    </td>
     <td class="actions">
         <a href="#" class="add-note" data-accountlines_id="[% line.accountlines_id | html %]"><i class="fa fa-plus"></i> Add note</a>
         <span class="payment_note" id="payment_note_[% line.accountlines_id | html %]" style="display:none"><input type="text" size="10" name="payment_note_[% line.accountlines_id | html %]" value="" /> <a href="#" class="cancel-note"><i class="fa fa-remove"></i></a></span>
@@ -117,16 +123,16 @@
 
 <tfoot>
     <tr>
-        <td class="total" colspan="10">Total due:</td>
+        <td class="total" colspan="11">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="total" colspan="11">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 class="total" colspan="11">Total due if credit applied:</td>
             <td style="text-align: right;">[% total + outstanding_credits.total_outstanding | $Price %]</td>
         </tr>
     [% END %]
-- 
2.20.1