From 969f5e6f86131a9558f1506f6b30091893ea0fce Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Tue, 18 Apr 2017 23:46:31 +0000
Subject: [PATCH] Bug 16486: Display the timestamp for account
 payments/writeoffs

To test:
1) Apply patch
2) Go to the patron account page, Fines tab
3) Click Account tab
4) Confirm timestamp shows next to payments and writeoffs
5) Go to Admin -> TimeFormat syspref, change the format
6) Refresh the fines page, confirm time format changes

Sponsored-by: Catalyst IT
---
 .../intranet-tmpl/prog/en/modules/members/boraccount.tt    | 14 +++++++-------
 members/boraccount.pl                                      |  3 ++-
 2 files changed, 9 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 ec79237..f3a7cf8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -85,23 +85,23 @@ $(document).ready(function() {
    <td><span title="[% account.date %]">[% account.date |$KohaDates %]</span></td>
       <td>
         [% SWITCH account.accounttype %]
-          [% CASE 'Pay' %]Payment, thanks
-          [% CASE 'Pay00' %]Payment, thanks (cash via SIP2)
-          [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2)
-          [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
+          [% CASE 'Pay' %]Payment on [% account.timestamp %], thanks
+          [% CASE 'Pay00' %]Payment on [% account.timestamp %], thanks (cash via SIP2)
+          [% CASE 'Pay01' %]Payment on [% account.timestamp %], thanks (VISA via SIP2)
+          [% CASE 'Pay02' %]Payment on [% account.timestamp %], thanks (credit card via SIP2)
           [% CASE 'N' %]New card
           [% CASE 'F' %]Fine
           [% CASE 'A' %]Account management fee
           [% CASE 'M' %]Sundry
           [% CASE 'L' %]Lost item
-          [% CASE 'W' %]Writeoff
+          [% CASE 'W' %]Written off on [% account.timestamp %]
           [% CASE 'FU' %]Accruing fine
           [% CASE 'HE' %]Hold waiting too long
           [% CASE 'Rent' %]Rental fee
           [% CASE 'FOR' %]Forgiven
           [% CASE 'LR' %]Lost item fee refund
-          [% CASE 'PAY' %]Payment
-          [% CASE 'WO' %]Writeoff
+          [% CASE 'PAY' %]Payment on [% account.timestamp %]
+          [% CASE 'WO' %]Written off on [% account.timestamp %]
           [% CASE 'C' %]Credit
           [% CASE 'CR' %]Credit
           [% CASE %][% account.accounttype %]
diff --git a/members/boraccount.pl b/members/boraccount.pl
index ee8ea09..58003af 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -32,7 +32,7 @@ use C4::Members;
 use C4::Accounts;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 use Koha::Patron::Images;
-
+use Koha::DateUtils;
 use Koha::Patron::Categories;
 
 my $input=new CGI;
@@ -90,6 +90,7 @@ foreach my $accountline ( @{$accts}) {
         $accountline->{payment} = 1;
         $reverse_col = 1;
     }
+    $accountline->{timestamp} = format_sqldatetime( $accountline->{timestamp} );
 }
 
 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-- 
2.1.4