From 1648caae63830051580b32d56165991a8e0518ac Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 4 Sep 2017 23:42:03 +0000 Subject: [PATCH] Bug 16486: [FOLLOW-UP] Putting time in date column In reply to Comment 6, I have moved the time into a column separate from the description. Unfortunately the timestamp has the date and the time, so I figured it was easier to just have them in the same column and replace the original date column. --- .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 16 ++++++++-------- 1 file changed, 8 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 aa6741b..0da1532 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -82,26 +82,26 @@ $(document).ready(function() { [% FOREACH account IN accounts %] - [% account.date |$KohaDates %] + [% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] - [% 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 '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 'N' %]New card [% CASE 'F' %]Fine [% CASE 'A' %]Account management fee [% CASE 'M' %]Sundry [% CASE 'L' %]Lost item - [% CASE 'W' %]Written off on [% account.timestamp | $KohaDates with_hours => 1 %] + [% CASE 'W' %]Written off [% 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 on [% account.timestamp | $KohaDates with_hours => 1 %] - [% CASE 'WO' %]Written off on [% account.timestamp | $KohaDates with_hours => 1 %] + [% CASE 'PAY' %]Payment + [% CASE 'WO' %]Written off [% CASE 'C' %]Credit [% CASE 'CR' %]Credit [% CASE %][% account.accounttype %] -- 2.1.4