From 0d888fc4197d8d70ca3710d448d6a293f34ab4f8 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 16 Apr 2023 01:06:53 +0000 Subject: [PATCH] Bug 22375: (follow-up) Format even more due dates consistently To test: Create some checkouts in future and past, make sure to include some with a time != 23:59.CirculateILL Verify that the due date is displayed correctly on: * Catalog detail page > Items tab > Checkout status * Circulation start page > Renew > Renew one of your checkouts > dialog message * ILL request page: requires ILL setup and CirculateILL system preference * Patron acccount in staff > Print > Print summary * Catalog detail page > Holds > search for patron > due date on checked out items * Recalls: * Activate UseRecalls system preference, set up circulation rules to allow recalls * Checkout an item to another user * In the OPAC, place a recall on that record with yor use * Check "Recall a specific item" * Verify due date in item list * Place recall on checked out item * Patron account in OPAC > Recalls history (due date might have been changed through recall) * OPAC patron account > Summary > Overdue tab * Self checkout: * Activate WebBasedSelfCheck * Go to /cgi-bin/koha/sco/sco-main.pl * Log in > Tab checkouts Signed-off-by: Katrin Fischer JD amended patch - removed 'fda' Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/moremember-print.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index b220f58002..06ba28827d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -174,7 +174,7 @@ Last renewed [% checkout.lastreneweddate | $KohaDates %], [% END %] [% IF ( checkout.date_due ) %] - Due back on [% checkout.date_due | $KohaDates %] + Due back on [% checkout.date_due | $KohaDates as_due_date => 1 %] [% ELSE %] Not checked out [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index a6f121eb73..9b0664a6d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -184,7 +184,7 @@ ( [% item.barcode | html %] ) renewed for [% borrower.firstname | html %] [% borrower.surname | html %] ( [% borrower.cardnumber | html %] ) - now due on [% date_due | $KohaDates %] + now due on [% date_due | $KohaDates as_due_date => 1 %]

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 261fa61096..d26e627730 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -289,7 +289,7 @@
  • - [% whole.value.check_out.date_due | $KohaDates with_hours => 1 %] + [% whole.value.check_out.date_due | $KohaDates as_due_date => 1 %]
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index 3a606e06bb..92a920d206 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -57,7 +57,7 @@ [% issue.author | html %] [% issue.itemcallnumber | html %] [% ItemTypes.GetDescription( issue.itype ) | html %] - [% issue.date_due | $KohaDates as_due_date => 1 %] + [% issue.date_due | $KohaDates as_due_date => 1 %] [% issue.barcode | html %] [% issue.stocknumber | html %] [% IF ( issue.charge <= 0 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index fb095ed66c..1008163734 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -852,7 +852,7 @@ [% END %] [% IF ( itemloo.onloan ) %] - Due [% itemloo.date_due | $KohaDates as_due_date => 1 %] + Due [% itemloo.date_due | $KohaDates as_due_date => 1 %] [% ELSE %] [% IF ( itemloo.transfertwhen ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt index 92625eb643..f2804af257 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt @@ -128,7 +128,7 @@ [% item.enumchron | html %] [% IF ( item.checkout ) %] - Due [% item.checkout.date_due | $KohaDates %] + Due [% item.checkout.date_due | $KohaDates as_due_date => 1 %] [% ELSIF ( item.get_transfer ) %] In transit from [% Branches.GetName( item.get_transfer.frombranch ) | html %] to [% Branches.GetName( item.get_transfer.tobranch ) | html %] since [% item.get_transfer.datesent | $KohaDates %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt index 8b7a358fa8..833befc69d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt @@ -101,7 +101,7 @@ Due date [% IF ( RECALL.requested ) %] - Due to be returned by [% RECALL.checkout.date_due | $KohaDates %] + Due to be returned by [% RECALL.checkout.date_due | $KohaDates as_due_date => 1 %] [% ELSIF ( RECALL.waiting and RECALL.expiration_date ) %] Pick up by [% RECALL.expiration_date | $KohaDates %] [% ELSE %] 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 c0382b81a4..ab56a84657 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -795,7 +795,7 @@ Date due: - [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] + [% OVERDUE.date_due | $KohaDates as_due_date => 1 %] [% IF ( OpacRenewalAllowed ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 7f2b299aee..1f40f5ce39 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -334,11 +334,11 @@ [% ISSUE.itemcallnumber | html %] [% IF ( ISSUE.overdue ) %] - [% ISSUE.date_due | $KohaDates as_due_date => 1 %] + [% ISSUE.date_due | $KohaDates as_due_date => 1 %] [% ELSE %] - [% ISSUE.date_due | $KohaDates as_due_date => 1 %] + [% ISSUE.date_due | $KohaDates as_due_date => 1 %] [% END %] -- 2.39.5