Attachment 74046 Details for Bug 16486 – Bug 16486: [FOLLOW-UP] Show original date and timestamp for fines

[patch] Bug 16486: [FOLLOW-UP] Show original date and timestamp for fines

Bug-16486-FOLLOW-UP-Show-original-date-and-timesta.patch (text/plain), 4.88 KB, created by Aleisha Amohia on 2018-04-12 04:50:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2018-04-12 04:50:04 UTC

Size: 4.88 KB

patch

obsolete

>From 4d06d133865f83af2a70f86f2d49278684f4e207 Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Tue, 16 Jan 2018 22:43:57 +0000
>Subject: [PATCH] Bug 16486: [FOLLOW-UP] Show original date and timestamp for
> fines
>
>This patch has two columns in fines tables, one showing the original
>date and one showing the timestamp (when the patch was last updated)
>
>Fixed merge conflicts
>
>Signed-off-by: Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt   | 4 +++-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 4 +++-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt | 4 +++-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt        | 6 ++++--
> 4 files changed, 13 insertions(+), 5 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 86e899a..e7cbf2a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
>@@ -35,7 +35,8 @@
> <table id="table_account_fines">
>     <thead>
>       <tr>
>-          <th class="title-string">Date</th>
>+          <th class="title-string">Original date</th>
>+          <th class="title-string">Updated</th>
>           <th>Description of charges</th>
>           <th>Note</th>
>           <th>Amount</th>
>@@ -52,6 +53,7 @@
>   [% FOREACH account IN accounts %]
> 
>    <tr>
>+   <td><span title="[% account.date %]">[% account.date | $KohaDates %]</span></td>
>    <td><span title="[% account.timestamp %]">[% account.timestamp | $KohaDates with_hours => 1 %]</span></td>
>       <td>
>         [% SWITCH account.accounttype %]
>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 0954645..a0dce37 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt
>@@ -38,7 +38,8 @@
> 	</th>
>  </tr>
>   <tr>
>-	<th>Date</th>
>+    <th>Original date</th>
>+    <th>Updated</th>
>     <th>Description of charges</th>
>     <th>Note</th>
>     <th>Amount</th>
>@@ -46,6 +47,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 %]
>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 39c4ccf..ca42ba3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt
>@@ -37,7 +37,8 @@
> 	</th>
>   </tr>
>   <tr>
>-	<th>Date</th>
>+    <th>Original date</th>
>+    <th>Updated</th>
>     <th>Description of charges</th>
>     <th>Note</th>
>     <th style="text-align:right;">Amount</th>
>@@ -46,6 +47,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 %]
>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 fb8f6f0..ba1e6c6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
>@@ -71,7 +71,8 @@
>                             <thead>
>                                 <tr>
>                                     [% IF ENABLE_OPAC_PAYMENTS %]<th>&nbsp;</th>[% END %]
>-                                    <th class="title-string">Date</th>
>+                                    <th class="title-string">Original date</th>
>+                                    <th class="title-string">Updated</th>
>                                     <th>Description</th>
>                                     <th>Fine amount</th>
>                                     <th>Amount outstanding</th>
>@@ -102,7 +103,8 @@
>                                                 [% END %]
>                                             </td>
>                                         [% END %]
>-                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %]</td>
>+                                        <td><span title="[% ACCOUNT_LINE.date %]">[% ACCOUNT_LINE.date | $KohaDates %]</td>
>+                                        <td><span title="[% ACCOUNT_LINE.timestamp %]">[% ACCOUNT_LINE.timestamp | $KohaDates with_hours => 1 %]</td>
>                                         <td>
>                                             [% SWITCH ACCOUNT_LINE.accounttype %]
>                                             [% CASE 'Pay' %]Payment, thanks
>-- 
>2.1.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