From f053ed8f7e126c1726c5593fe6b3311e24887137 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 6 Feb 2023 17:03:32 +0100
Subject: [PATCH] Bug 32788: Order curbside pickup slots chronologically

We need to order the slots chronologically, not depending on when they
have been added.

Test plan:
Create a slot 13 to 17 the another one 8 to 12
We want to display 8 to 12 before 13 to 17.
Confirm that this patch fixes that on the 3 following views:
Curbside pickups admin
Curbside pickups staff side
Curbside pickups at the OPAC

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0481f1d74e7d6175e1eb31b299f01c7cc7ce6090)
Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt      | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt      | 2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
index cac1c85f71..d26d426277 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
@@ -235,7 +235,7 @@
                .filter(d => d in slots_per_day)
                .map( day => {
                     let li_node = $('<li><label>'+get_day_lib(day)+'<label></li>');
-                    slots_per_day[day].forEach(function(slot) {
+                    slots_per_day[day].sort().forEach(function(slot) {
                         let span_node = $('<span class="pickup-slot"></span>');
                         span_node.append('<input type="hidden" name="pickup-slot-'+branchcode+'" value="'+slot+'"/>');
                         span_node.append('<span>'+format_slot(slot)+'</span>');
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 e2007122a8..8264304413 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
@@ -572,7 +572,7 @@
                     return;
                 }
 
-                slots_per_day[dow].forEach(function(slot){
+                slots_per_day[dow].sort((a, b) => a.start_hour - b.start_hour).forEach(function(slot){
                     let pickup_interval = policy.pickup_interval;
                     if (!pickup_interval) {
                         $('#pickup-times').html("<div>"+_("No pickup time defined for this day.")+"</div>");
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 c24d1255ba..d4685e35f5 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
@@ -374,7 +374,7 @@
                     return;
                 }
 
-                policy.slots_per_day[dow].forEach(function(slot){
+                policy.slots_per_day[dow].sort((a, b) => a.start_hour - b.start_hour).forEach(function(slot){
                     let pickup_interval = policy.pickup_interval;
                     if (!pickup_interval) {
                         $('#pickup-times').html("<div>"+_("No pickup time defined for this day.")+"</div>");
-- 
2.20.1