tripstorekrabi-shared 1.6.3 → 1.6.6

package/package.json

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

package/price.js

@@ -15,9 +15,9 @@ export function calculateProductPrice(booking, pricing, selling = true) {
       } else {
         let bookingType = getBookingType(booking.referenceNumber);
 
-        if (volume[bookingType]?.active) {
+        if (volume[bookingType]) {
           let customPricing = volume[bookingType];
-          total = booking.adults * (selling ? customPricing.adult.partnerNetPrice : customPricing.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (selling ? customPricing.child.partnerNetPrice : customPricing.child.operatorNetPrice) : 0);
+          total = booking.adults * (selling ? customPricing.adult.partnerNetPrice : customPricing.adult.operatorNetPrice ?? volume.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (selling ? customPricing.child.partnerNetPrice : customPricing.child.operatorNetPrice ?? volume.child.operatorNetPrice) : 0);
         } else {
           total = booking.adults * (selling ? volume.adult.sellingPrice : volume.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (selling ? volume.child.sellingPrice : volume.child.operatorNetPrice) : 0);
         }
@@ -32,9 +32,9 @@ export function calculateProductPrice(booking, pricing, selling = true) {
       } else {
         let bookingType = getBookingType(booking.referenceNumber);
 
-        if (volume[bookingType]?.active) {
+        if (volume[bookingType]) {
           let customPricing = volume[bookingType];
-          total = selling ? customPricing.partnerNetPrice : customPricing.operatorNetPrice;
+          total = selling ? customPricing.partnerNetPrice : customPricing.operatorNetPrice ?? volume.operatorNetPrice;
         } else {
           total = (selling ? volume.sellingPrice : volume.operatorNetPrice);
         }

package/utils.js

@@ -292,16 +292,6 @@ export function isNumeric(n) {
   return !isNaN(parseFloat(n)) && isFinite(n);
 }
 
-export function validURL(str) {
-  var pattern = new RegExp('^(https?:\\/\\/)?' + // protocol
-    '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
-    '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-    '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-    '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-    '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-  return !!pattern.test(str);
-}
-
 export function getBookingSummary(booking, options = {}) {
   let summary = "";
   if (!options.excludeReferenceNumber) {
@@ -317,7 +307,7 @@ export function getBookingSummary(booking, options = {}) {
   }
 
   if (booking.productDescription && booking.operator && booking.departureDate && booking.schedule && booking.leadTraveller) {
-    let departureDate = dayjs(booking.departureDate.toDate()).format("DD.MM.YYYY");
+    let departureDate = dayjs(booking.departureDate.toDate()).tz("Asia/Bangkok").format("DD.MM.YYYY");
     summary += booking.productDescription + ", " + departureDate + ", " + booking.operator + ", " + booking.adults + ", " + booking.children + ", "
       + booking.infants + ", " + booking.leadTraveller;
 
@@ -448,10 +438,10 @@ export function validatePickupTime(pickupTime, schedule = "", context) {
       return checkTime(from, departureTime, context);
     }
   } else if (pickupTime.indexOf("-") != -1) {
-    return context.createError({ message: `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("-", " - ")}`, path: context.path, });
   } else {
     if (!SCHEDULE_PATTERN.test(pickupTime)) {
-      return context.createError({ message: "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'", path: context.path, });
     } else {
       return checkTime(pickupTime, departureTime, context);
     }
@@ -470,7 +460,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 must be before or equals departure time" });
+    return pickupTime.isSameOrBefore(departureTime) ? true : context.createError({ message: "Pickup time must be before or equals departure time", path: context.path, });
   } catch (e) {
     return false;
   }