From c380074f7f6627d453e234457c8440131d189643 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia 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 Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 14 +++++++------- members/boraccount.pl | 1 + 2 files changed, 8 insertions(+), 7 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..aa6741b 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() { [% account.date |$KohaDates %] [% 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 | $KohaDates with_hours => 1 %], thanks + [% CASE 'Pay00' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %], thanks (cash via SIP2) + [% CASE 'Pay01' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %], thanks (VISA via SIP2) + [% CASE 'Pay02' %]Payment on [% account.timestamp | $KohaDates with_hours => 1 %], 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 | $KohaDates with_hours => 1 %] [% 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 | $KohaDates with_hours => 1 %] + [% CASE 'WO' %]Written off on [% account.timestamp | $KohaDates with_hours => 1 %] [% CASE 'C' %]Credit [% CASE 'CR' %]Credit [% CASE %][% account.accounttype %] diff --git a/members/boraccount.pl b/members/boraccount.pl index e7d769e..58baa91 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -32,6 +32,7 @@ use C4::Members; use C4::Accounts; use C4::Members::Attributes qw(GetBorrowerAttributes); use Koha::Patrons; +use Koha::Patron::Images; use Koha::Patron::Categories; my $input=new CGI; -- 2.1.4