From 85e1b7c4d28272ddd72f490faf28101a4db80132 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Tue, 16 Jan 2018 22:43:57 +0000
Subject: [PATCH] Bug 16486: [FOLLOW-UP] Show original date and timestamp for
 fines

This patch has two columns in fines tables, one showing the original
date and one showing the timestamp (when the patch was last updated)
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt   | 4 +++-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 4 +++-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 8 +++++---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt        | 6 ++++--
 members/printfeercpt.pl                                         | 3 ++-
 members/printinvoice.pl                                         | 1 +
 6 files changed, 18 insertions(+), 8 deletions(-)

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 5260b90..7062b47 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -65,7 +65,8 @@ $(document).ready(function() {
 <table id="table_account_fines">
     <thead>
       <tr>
-          <th class="title-string">Date</th>
+          <th class="title-string">Original date</th>
+          <th class="title-string">Updated</th>
           <th>Description of charges</th>
           <th>Note</th>
           <th>Amount</th>
@@ -82,6 +83,7 @@ $(document).ready(function() {
   [% FOREACH account IN accounts %]
 
    <tr>
+   <td><span title="[% account.date %]">[% account.date | $KohaDates %]</span></td>
    <td><span title="[% account.timestamp %]">[% account.timestamp | $KohaDates with_hours => 1 %]</span></td>
       <td>
         [% SWITCH account.accounttype %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
index 467700a..c8f5e2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
@@ -35,7 +35,8 @@
 	</th>
  </tr>
   <tr>
-	<th>Date</th>
+    <th>Original date</th>
+    <th>Updated</th>
     <th>Description of charges</th>
     <th>Note</th>
     <th>Amount</th>
@@ -43,6 +44,7 @@
 
   [% FOREACH account IN accounts %]
 <tr class="highlight">
+      <td>[% account.date | $KohaDates %]</td>
       <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
       <td>
         [% SWITCH account.accounttype %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
index d89e204..5f36936 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
@@ -35,7 +35,8 @@
 	</th>
   </tr>
   <tr>
-	<th>Date</th>
+    <th>Original date</th>
+    <th>Updated</th>
     <th>Description of charges</th>
     <th>Note</th>
     <th style="text-align:right;">Amount</th>
@@ -44,8 +45,9 @@
 
   [% FOREACH account IN accounts %]
 <tr class="highlight">
-      <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
-       <td>
+    <td>[% account.date | $KohaDates %]</td>
+    <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
+    <td>
         [% SWITCH account.accounttype %]
           [% CASE 'Pay' %]Payment, thanks
           [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
index b7798f8..2e109df 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
@@ -71,7 +71,8 @@
                             <thead>
                                 <tr>
                                     [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
-                                    <th class="title-string">Date</th>
+                                    <th class="title-string">Original date</th>
+                                    <th class="title-string">Updated</th>
                                     <th>Description</th>
                                     <th>Fine amount</th>
                                     <th>Amount outstanding</th>
@@ -102,7 +103,8 @@
                                                 [% END %]
                                             </td>
                                         [% END %]
-                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %]</td>
+                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
+                                        <td><span title="[% ACCOUNT_LINE.timestamp %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %]</td>
                                         <td>
                                             [% SWITCH ACCOUNT_LINE.accounttype %]
                                             [% CASE 'Pay' %]Payment, thanks
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index f4a6df7..428627b 100755
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -97,7 +97,8 @@ for (my $i=0;$i<$numaccts;$i++){
         $accts->[$i]{'amountoutstandingcredit'} = 1;
     }
 
-    my %row = ( 'timestamp' => $accts->[$i]{'timestamp'},
+    my %row = ( 'date' => dt_from_string( $accts->[$i]{'date'} ),
+                'timestamp' => $accts->[$i]{'timestamp'},
                 'amountcredit' => $accts->[$i]{'amountcredit'},
                 'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
                 'toggle' => $accts->[$i]{'toggle'},
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index 7f705d8..ae6f7a1 100755
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -97,6 +97,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
     }
 
     my %row = (
+        'date'                    => dt_from_string( $accts->[$i]{'date'} ),
         'timestamp'               => $accts->[$i]{'timestamp'},
         'amountcredit'            => $accts->[$i]{'amountcredit'},
         'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
-- 
2.1.4