tripstorekrabi-shared 1.9.2 → 1.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {

package/utils.js

@@ -94,8 +94,8 @@ export function getPickuptimeSummary(pickupZones) {
   if (pickupZones) {
     let pickupTimesArray = [];
     pickupZones.forEach((pickupZone) => {
-      var pickupLength = pickupZone.indexOf(": ");
-      var pickupTimes = pickupZone.substring(pickupLength + 1).trim();
+      let pickupLength = pickupZone.indexOf(": ");
+      let pickupTimes = pickupZone.substring(pickupLength + 1).trim();
       if (pickupZone.indexOf(" / ") != -1) {
         pickupTimesArray.push(pickupTimes.split(" / "));
       } else {
@@ -244,7 +244,7 @@ export function transformToNCols(array, n) {
 
 function chunkArray(array, chunk_size) {
   array = [...array];
-  var results = [];
+  let results = [];
 
   while (array.length) {
     results.push(array.splice(0, chunk_size));
@@ -397,9 +397,9 @@ export function validateSchedule(schedule, schedules = [], context) {
   if (schedule === "?") {
     return true;
   } else if (schedule.indexOf(" - ") != -1) {
-    var times = schedule.split(" - ");
-    var from = times[0];
-    var to = times[1];
+    let times = schedule.split(" - ");
+    let from = times[0];
+    let to = times[1];
 
     if (!SCHEDULE_PATTERN.test(from) || !SCHEDULE_PATTERN.test(to) || (from === to)) {
       return context.createError({ message: "Invalid schedule format: for example use '09:00 - 15:30'", path: context.path, });
@@ -427,9 +427,9 @@ export function validatePickupTime(pickupTime, schedule = "", context) {
   if (pickupTime === "?" || schedule === "?") {
     return true;
   } else if (pickupTime.indexOf(" - ") != -1) {
-    var times = pickupTime.split(" - ");
-    var from = times[0];
-    var to = times[1];
+    let times = pickupTime.split(" - ");
+    let from = times[0];
+    let to = times[1];
 
     if (!SCHEDULE_PATTERN.test(from) || !SCHEDULE_PATTERN.test(to) || (from === to)) {
       return context.createError({ message: "Invalid pickup time format: for example use '09:00' or '08:45 - 09:00'" });
@@ -447,6 +447,18 @@ export function validatePickupTime(pickupTime, schedule = "", context) {
   }
 }
 
+export function isPickupTimeAfterDepartureTime(schedule, pickupTime) {
+  let departureTime = schedule.split(" - ")[0];
+  if (pickupTime === "?" || schedule === "?") {
+    return false;
+  } else if (pickupTime.indexOf(" - ") != -1) {
+    let times = pickupTime.split(" - ");
+    pickupTime = times[0];
+  }
+
+  return checkTime(pickupTime, departureTime);
+}
+
 function checkTime(pickupTimeValue, departureTimeValue, context) {
   if (pickupTimeValue === "" || departureTimeValue === "") {
     return false;
@@ -459,7 +471,7 @@ function checkTime(pickupTimeValue, departureTimeValue, context) {
     let departureTimeValues = departureTimeValue.split(":");
     let departureTime = dayjs().hour(departureTimeValues[0]).minute(departureTimeValues[1]).second(0);
 
-    return pickupTime.isSameOrBefore(departureTime) ? true : context.createError({ message: "Pickup time should be before or equals departure time", path: context.path, params: { status: "warning" } });
+    return pickupTime.isSameOrBefore(departureTime) ? true : context ? context.createError({ message: "Pickup time should be before or equals departure time", path: context.path, params: { status: "warning" } }) : false;
   } catch (e) {
     return false;
   }