tripstorekrabi-shared 1.17.7 → 1.17.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.17.7",
+  "version": "1.17.8",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {
@@ -15,7 +15,7 @@
     "./product": "./product.js"
   },
   "dependencies": {
-    "dayjs": "^1.11.11",
+    "dayjs": "^1.11.13",
     "libphonenumber-js": "^1.11.7",
     "nanoid": "^5.0.7"
   },

package/price.js

@@ -1,4 +1,8 @@
 import { CUSTOM_MEETING_POINT, TELL_HOTEL_LATER_STARTING_POINT, getBookingType } from "./utils.js";
+import dayjs from 'dayjs';
+import isBetween from 'dayjs/plugin/isBetween';
+
+dayjs.extend(isBetween);
 
 export const MAX_PAX = 100;
 export const PAY_ON_TOUR = 'Pay on tour';
@@ -45,6 +49,10 @@ function calculateSellingPrice(commissionRate, price) {
 }
 
 function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE }) {
+  if (pricing.promotion && dayjs(booking.departureDate.toDate()).isBetween(pricing.promotion.startDate.toDate(), pricing.promotion.endDate.toDate(), "day", "[]")) {
+    pricing = { ...pricing, volumes: pricing.promotion.volumes };
+  }
+
   let type = pricing.type;
   let total = 0;
 
@@ -83,7 +91,6 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
         break;
       }
     }
-
     case "group": {
       let volume = findVolume(booking, pricing);
       if (!volume) {
@@ -157,7 +164,7 @@ export function calculatePartnerNetPrice(booking, product) {
     booking,
     product
   ).reduce(
-    (prev, curr) => prev + curr.price,
+    (prev, curr) => (prev ?? 0) + curr.price,
     calculateProductPartnerNetPrice(
       booking,
       product.pricing
@@ -178,7 +185,7 @@ export function calculateTotalOperatorPrice(booking, product) {
 }
 
 function calculateTotalPrice(booking, product, options = { mode: SELLING_MODE }) {
-  let total = calculateProductPrice(booking, product.pricing, options);
+  let total = calculateProductPrice(booking, product.pricing, options) ?? 0;
   total += calculateStartEndPointPrice(booking, findStartingPoint(product, booking.startingPointId, false), options);
   total += calculateStartEndPointPrice(booking, findEndPoint(product, booking.endPointId, false), options);
   total += calculateNationalParkFee(booking, product);
@@ -374,6 +381,8 @@ function calculateStartEndPointPrice(people, startEndPoint, options = { mode: SE
       return (isSelling ? pricing.sellingPrice : pricing.operatorNetPrice) * Math.ceil((people.adults + people.children) / pricing.max);
     } else if (pricing.type === "person") {
       return (isSelling ? pricing.sellingPrice : pricing.operatorNetPrice) * (people.adults + people.children);
+    } else {
+      return 0;
     }
   } else {
     return 0;

package/utils.js

@@ -710,6 +710,7 @@ export function getBookingType(referenceNumber) {
   if (!referenceNumber) {
     return '';
   }
+
   if (isGYGBooking(referenceNumber)) {
     return 'gyg';
   } else if (isViatorBooking(referenceNumber)) {
@@ -729,6 +730,8 @@ export function getBookingType(referenceNumber) {
   } else if (isTSKBooking(referenceNumber)) {
     return 'tsk';
   }
+
+  return '';
 }
 
 export function hasCustomPricing(pricing, bookingType) {