From db1995935f6d07b707c6012f344fef9b2a3b25fe Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
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 <koha@univ-lyon3.fr>

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../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 %]
     <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script>
+    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
     [% INCLUDE 'calendar.inc' %]
     <script>
         let pickups = [% To.json(curbside_pickups.unblessed) | $raw %];
@@ -538,7 +540,7 @@
 
                 var currentDate = $(this).val();
 
-                let selectedDate = dayjs(currentDate);
+                let selectedDate = dayjs(currentDate, get_dateformat_str(dateformat_pref).toUpperCase());
 
                 let pickupSlots = [];
                 let available_count = 0;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
index 8a4877f9f4..1ef4ffb611 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
@@ -32,6 +32,20 @@
         default:
             flatpickr_dateformat_string = "Y-m-d";
     }
+
+    function get_dateformat_str(dateformat) {
+        var dateformat_str;
+        if (dateformat == 'us') {
+            dateformat_str = 'mm/dd/yyyy';
+        } else if (dateformat == 'metric') {
+            dateformat_str = 'dd/mm/yyyy';
+        } else if (dateformat == 'iso') {
+            dateformat_str = 'yyyy-mm-dd';
+        } else if (dateformat == 'dmydot') {
+            dateformat_str = 'dd.mm.yyyy';
+        }
+        return dateformat_str;
+    }
 </script>
 [% Asset.js("lib/flatpickr/flatpickr.min.js") | $raw %]
 <script>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
index f3472651d6..35e3efad2d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
@@ -218,7 +218,9 @@
 [% BLOCK jsinclude %]
     [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %]
     [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %]
+    [% Asset.js("lib/dayjs/plugin/customParseFormat.js") | $raw %]
     <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script>
+    <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script>
     [% INCLUDE 'calendar.inc' %]
     <script>
         [% SET pickup_exists_in = [] %]
@@ -298,7 +300,7 @@
             let branchcode = $("#pickup-branch").val();
             let policy = policies[branchcode];
 
-            let selectedDate = dayjs(currentDate);
+            let selectedDate = dayjs(currentDate, get_dateformat_str(dateformat_pref).toUpperCase());
 
             let pickupSlots = [];
             let available_count = 0;
-- 
2.39.5