From 9be4dc1a87f68bb12146b5093454a0263f7d84ac Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Wed, 20 Feb 2019 12:41:04 +0000 Subject: [PATCH] Bug 22375: Format due date consistantly Test plan: Make some daily an hourly checkouts and confirm the right display (hourly with hours and minutes, daily only date) of due date on these places: 1) catalogue -> checkout history 2) circulation -> overdues with fines 3) 4) circulation -> pending on site checkouts 5) patrons circulation history 6) opac -> account summary -> relatives checkouts Note: I suspect the moremember-receipt.tt template is not used anymore Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit e80d5fc0d0ae7085bd86d8e9c38d16d5de415e48) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 6 +++--- .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/readingrec.tt | 7 +++---- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt index 80c04a69e7..ba2c56a392 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -96,7 +96,7 @@ [% checkout.issuedate |$KohaDates with_hours => 1 %] - [% checkout.date_due |$KohaDates with_hours => 1 %] + [% checkout.date_due | $KohaDates as_due_date => 1 %] [% checkout.returndate |$KohaDates with_hours => 1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index 1f3baf4045..bf203e0c28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -56,7 +56,7 @@ [% FOREACH overduesloo IN overduesloop %] - [% overduesloo.date_due | html %] + [% overduesloo.date_due | $KohaDates as_due_date => 1 %] [% INCLUDE 'biblio-title.inc' biblio=overduesloo link = 1 %] [% IF ( overduesloo.author ) %] by [% overduesloo.author | html %][% END %] @@ -82,7 +82,7 @@ [% IF ( todayoverduesloop ) %]
- + @@ -94,7 +94,7 @@ [% IF Koha.Preference('RecordStaffUserOnCheckout') %] [% END %] [% IF issue.returndate %] [% ELSE %] [% END %] [% UNLESS ( item_level_itypes ) %] -- 2.39.5
Today's notificationsToday's notifications
Date due Title

- [% todayoverduesloo.date_due | html %] + [% todayoverduesloo.date_due | $KohaDates as_due_date => 1 %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index 06620173cb..11e8db0e3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -52,7 +52,7 @@
[% IF item.is_overdue %][% END %] - [% item.date_due | $KohaDates %] + [% item.date_due | $KohaDates as_due_date => 1 %] [% IF item.is_overdue %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt index 16c6bc3776..ec4c5dfdb9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -110,18 +110,18 @@ [% END %] - [% issue.issuedate |$KohaDates with_hours => 1 %] + [% issue.issuedate |$KohaDates with_hours => 1 %] [% Branches.GetName( issue.branchcode ) | html %][% issue.firstname | html %] [% issue.surname | html %] - [% issue.date_due |$KohaDates with_hours => 1 %] + [% issue.date_due | $KohaDates as_due_date => 1 %] - [% issue.returndate |$KohaDates with_hours => 1 %] + [% issue.returndate |$KohaDates with_hours => 1 %] [% ELSE %] Checked out @@ -151,7 +151,6 @@ [% INCLUDE table_readingrec %] [% END # /IF Koha.Preference('OnSiteCheckouts') %] - [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 22ce4ca580..89d726132f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -412,12 +412,12 @@ [% IF ( ISSUE.overdue ) %] Date due: - [% ISSUE.date_due | $KohaDates as_due_date => 1 %] + [% ISSUE.date_due | $KohaDates as_due_date => 1 %] Date due: - [% ISSUE.date_due | $KohaDates as_due_date => 1 %] + [% ISSUE.date_due | $KohaDates as_due_date => 1 %]