tripstorekrabi-shared 1.3.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.3.0",
+  "version": "1.6.1",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer",
   "repository": {

package/utils.js

@@ -404,7 +404,7 @@ export function getItemSummary(item, product) {
   return summary;
 }
 
-export function validateSchedule(schedule, schedules = [], boolean = false, context) {
+export function validateSchedule(schedule, schedules = [], context) {
   if (schedule === "?") {
     return true;
   } else if (schedule.indexOf(" - ") != -1) {
@@ -413,13 +413,12 @@ export function validateSchedule(schedule, schedules = [], boolean = false, cont
     var to = times[1];
 
     if (!SCHEDULE_PATTERN.test(from) || !SCHEDULE_PATTERN.test(to) || (from === to)) {
-      return boolean ? false : "Invalid schedule format: for example use '09:00 - 15:30'";
+      return context.createError({ message: "Invalid schedule format: for example use '09:00 - 15:30'", path: context.path, });
     }
   } else {
-    return boolean ? false : "Invalid schedule format: for example use '09:00 - 15:30'";
+    return context.createError({ message: "Invalid schedule format: for example use '09:00 - 15:30'", path: context.path, });
   }
 
-
   if (schedule != "") {
     if (schedules.length > 0 && schedules.indexOf(schedule) == -1) {
       return context.createError({
@@ -433,7 +432,9 @@ export function validateSchedule(schedule, schedules = [], boolean = false, cont
   return true;
 }
 
-export function validatePickupTime(pickupTime, schedule) {
+export function validatePickupTime(pickupTime, schedule = "") {
+  console.log(pickupTime);
+  console.log(schedule);
   let departureTime = schedule.split(" - ")[0];
 
   if (pickupTime === "?" || schedule === "?") {
@@ -444,22 +445,22 @@ export function validatePickupTime(pickupTime, schedule) {
     var to = times[1];
 
     if (!SCHEDULE_PATTERN.test(from) || !SCHEDULE_PATTERN.test(to) || (from === to)) {
-      return "Invalid pickup time format: for example use '09:00' or '08:45 - 09:00'";
+      return context.createError({ message: "Invalid pickup time format: for example use '09:00' or '08:45 - 09:00'" });
     } else {
-      return checkTime(from, departureTime);
+      return checkTime(from, departureTime, context);
     }
   } else if (pickupTime.indexOf("-") != -1) {
-    return `Invalid pickup time format, use spaces around the dash: ${pickupTime.replace(/ /g, '').replace("-", " - ")}`;
+    return context.createError({ message: `Invalid pickup time format, use spaces around the dash: ${pickupTime.replace(/ /g, '').replace("-", " - ")}` });
   } else {
     if (!SCHEDULE_PATTERN.test(pickupTime)) {
-      return "Invalid pickup time format: for example use '09:00' or '08:45 - 09:00'";
+      return context.createError({ message: "Invalid pickup time format: for example use '09:00' or '08:45 - 09:00'" });
     } else {
-      return checkTime(pickupTime, departureTime);
+      return checkTime(pickupTime, departureTime, context);
     }
   }
 }
 
-function checkTime(pickupTimeValue, departureTimeValue) {
+function checkTime(pickupTimeValue, departureTimeValue, context) {
   if (pickupTimeValue === "" || departureTimeValue === "") {
     return false;
   }
@@ -471,16 +472,12 @@ function checkTime(pickupTimeValue, departureTimeValue) {
     let departureTimeValues = departureTimeValue.split(":");
     let departureTime = dayjs().hour(departureTimeValues[0]).minute(departureTimeValues[1]).second(0);
 
-    return pickupTime.isSameOrBefore(departureTime) ? true : "Pickup time must be before or equals departure time";
+    return pickupTime.isSameOrBefore(departureTime) ? true : context.createError({ message: "Pickup time must be before or equals departure time" });
   } catch (e) {
     return false;
   }
 }
 
-export function hasCustomerEmail(email) {
-  return email && email !== "info@tripstorekrabi.com";
-}
-
 export function isActivity(url) {
   return url.includes("/Activities/");
 }