Attachment 70689 Details for Bug 16486 – Bug 16486: [FOLLOW-UP] Adding timestamp to date in other places

[patch] Bug 16486: [FOLLOW-UP] Adding timestamp to date in other places

Bug-16486-FOLLOW-UP-Adding-timestamp-to-date-in-ot.patch (text/plain), 4.76 KB, created by Biblibre Sandboxes on 2018-01-18 13:27:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Biblibre Sandboxes

Created: 2018-01-18 13:27:23 UTC

Size: 4.76 KB

patch

obsolete

>From 8dbc812d44bf7cbada7a3b7432db6d35a83310e8 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>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 <simon.pouchol@biblibre.com>
>
>Signed-off-by: Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca>
>---
> 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 %]
> <tr class="highlight">
>-      <td>[% account.date | $KohaDates %]</td>
>+      <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
>       <td>
>         [% 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' %]
> <title>Print receipt for [% cardnumber %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -43,7 +44,7 @@
> 
>   [% FOREACH account IN accounts %]
> <tr class="highlight">
>-      <td>[% account.date %]</td>
>+      <td>[% account.timestamp | $KohaDates with_hours => 1 %]</td>
>        <td>
>         [% 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 %]
>                                             </td>
>                                         [% END %]
>-                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td>
>+                                        <td><span title="[% ACCOUNT_LINE.date %]">[% 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 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

Actions: View | Diff | Splinter Review

Attachments on bug 16486: 62343 | 62703 | 62995 | 66826 | 66827 | 67537 | 67538 | 68302 | 68303 | 68304 | 68316 | 70578 | 70579 | 70580 | 70582 | 70583 | 70650 | 70687 | 70688 | 70689 | 70690 | 70691 | 71870 | 74045 | 74046 | 74047 | 103534 | 103938 | 117232 | 117233 | 117348 | 120479 | 120485