From db1995935f6d07b707c6012f344fef9b2a3b25fe Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 6 Jul 2022 16:08:35 +0200 Subject: [PATCH] Bug 30650: Take dateformat into account dayjs init was not passing the dateformat. We really need to clean the date handling with the following two bugs: Bug 30310 - Replace Moment.js with Day.js and Bug 30718 - Use flatpickr's altInput option everywhere But it's outside the scope of this bug report. Signed-off-by: Koha Team University Lyon 3 Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/circ/curbside_pickups.tt | 4 +++- .../opac-tmpl/bootstrap/en/includes/calendar.inc | 14 ++++++++++++++ .../bootstrap/en/modules/opac-curbside-pickups.tt | 4 +++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index 1e24390bd6..8f8ea7bd85 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -502,7 +502,9 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %] [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %] + [% Asset.js("lib/dayjs/plugin/customParseFormat.js") | $raw %] + [% INCLUDE 'calendar.inc' %] [% Asset.js("lib/flatpickr/flatpickr.min.js") | $raw %] + [% INCLUDE 'calendar.inc' %]