From 8dbc812d44bf7cbada7a3b7432db6d35a83310e8 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 5 Sep 2017 02:39:03 +0000 Subject: [PATCH] Bug 16486: [FOLLOW-UP] Adding timestamp to date in other places As suggested in Comment 7. The timestamp has also been added to printfeercpt.tt, printinvoice.tt, and opac-account.tt To test: 1) In Staff side, go to member account, go to Fines, go to Account tab 2) Click the Print button next to a payment 3) Confirm timestamp shows on print slip 4) Create a manual invoice 5) Go back to the Account tab 6) Click the Print button next to the invoice 7) Confirm timestamp shows on print slip 8) Log into OPAC 9) Go to your fines 10) Confirm timestamp shows Works as intended. Signed-off-by: Simon Pouchol Signed-off-by: Marjorie Barry-Vila --- koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 +- members/printfeercpt.pl | 2 +- members/printinvoice.pl | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) 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 a61d507..467700a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt @@ -43,7 +43,7 @@ [% FOREACH account IN accounts %] - [% account.date | $KohaDates %] + [% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] [% CASE 'Pay' %]Payment, thanks 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 7004214..d89e204 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt @@ -1,4 +1,5 @@ [% USE Koha %] +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] Print receipt for [% cardnumber %] [% INCLUDE 'doc-head-close.inc' %] @@ -43,7 +44,7 @@ [% FOREACH account IN accounts %] - [% account.date %] + [% account.timestamp | $KohaDates with_hours => 1 %] [% SWITCH account.accounttype %] [% CASE 'Pay' %]Payment, thanks 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 7e2d7b9..b7798f8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -102,7 +102,7 @@ [% END %] [% END %] - [% ACCOUNT_LINE.date | $KohaDates %] + [% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %] [% SWITCH ACCOUNT_LINE.accounttype %] [% CASE 'Pay' %]Payment, thanks diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl index 8bce7a8..a4ee8e1 100755 --- a/members/printfeercpt.pl +++ b/members/printfeercpt.pl @@ -97,7 +97,7 @@ for (my $i=0;$i<$numaccts;$i++){ $accts->[$i]{'amountoutstandingcredit'} = 1; } - my %row = ( 'date' => dt_from_string( $accts->[$i]{'date'} ), + my %row = ( '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 53c9438..6fe01bd 100755 --- a/members/printinvoice.pl +++ b/members/printinvoice.pl @@ -97,7 +97,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) { } my %row = ( - 'date' => output_pref({ dt => dt_from_string( $accts->[$i]{'date'} ), dateonly => 1 }), + 'timestamp' => $accts->[$i]{'timestamp'}, 'amountcredit' => $accts->[$i]{'amountcredit'}, 'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'}, 'toggle' => $accts->[$i]{'toggle'}, -- 2.7.4