Bug 30650: Prevent browser crash if no pickup interval set

Don't get stuck in an infinite loop

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>

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 58f0767..07f4e9d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -550,6 +550,10 @@
 
                 slots_per_day[dow].forEach(function(slot){
                     let pickup_interval = policy.pickup_interval;
+                    if (!pickup_interval) {
+                        $('#pickup-times').html("<div>"+_("No pickup time define for this day.")+"</div>");
+                        return;
+                    }
 
                     let listStartMoment = selectedDate.hour(slot.start_hour).minute(slot.start_minute);
                     let listEndMoment = selectedDate.hour(slot.end_hour).minute(slot.end_minute);

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 5b6fe81..55852cc 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt
@@ -310,6 +310,10 @@
 
             policy.slots_per_day[dow].forEach(function(slot){
                 let pickup_interval = policy.pickup_interval;
+                if (!pickup_interval) {
+                    $('#pickup-times').html("<div>"+_("No pickup time define for this day.")+"</div>");
+                    return;
+                }
 
                 let listStartMoment = selectedDate.hour(slot.start_hour).minute(slot.start_minute);
                 let listEndMoment = selectedDate.hour(slot.end_hour).minute(slot.end_minute);