tripstorekrabi-shared 1.23.6 → 1.23.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.23.6",
+  "version": "1.23.8",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {
@@ -17,9 +17,9 @@
     "./telegram": "./telegram.js"
   },
   "dependencies": {
-    "dayjs": "^1.11.19",
-    "libphonenumber-js": "^1.12.36",
-    "nanoid": "^5.1.6"
+    "dayjs": "^1.11.20",
+    "libphonenumber-js": "^1.12.41",
+    "nanoid": "^5.1.7"
   },
   "scripts": {
     "deploy": "npm publish"

package/price.js

@@ -27,6 +27,45 @@ const SELLING_MODE = 0;
 const PARTNER_MODE = 1;
 const OPERATOR_MODE = 2;
 
+export function getActiveRevision(booking, pricing) {
+  if (!pricing?.revisions || pricing.revisions.length === 0) return null;
+
+  const getSafeDate = (dateField) => {
+    if (!dateField) return null;
+    if (typeof dateField.toDate === 'function') return dayjs(dateField.toDate());
+    return dayjs(dateField);
+  };
+
+  const bookingDate = getSafeDate(booking.date)?.startOf('day');
+  if (!bookingDate || !bookingDate.isValid()) return null;
+
+  const candidateRevisions = pricing.revisions.filter((rev) => {
+    if (rev.isActive === false) return false;
+
+    const revStart = getSafeDate(rev.startDate)?.startOf('day');
+    if (!revStart || !revStart.isValid()) return false;
+
+    return revStart.isSame(bookingDate) || revStart.isBefore(bookingDate);
+  });
+
+  if (candidateRevisions.length === 0) return null;
+
+  return candidateRevisions.sort((a, b) => {
+    const aTime = getSafeDate(a.startDate)?.valueOf() || 0;
+    const bTime = getSafeDate(b.startDate)?.valueOf() || 0;
+    return bTime - aTime;
+  })[0];
+}
+
+export function getActivePricing(booking, pricing) {
+  const activeRevision = getActiveRevision(booking, pricing);
+
+  return {
+    ...pricing,
+    ...activeRevision.pricing
+  };
+}
+
 export function calculateProductSellingPrice(booking, pricing) {
   return booking.customerPaymentStatus === "Refunded" ? 0 : calculateProductPrice(booking, pricing, { mode: SELLING_MODE });
 }
@@ -70,22 +109,35 @@ export function calculateInflatedSellingPrice(price, config, forceInflation = fa
 }
 
 function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE }) {
-  if (pricing.promotion) {
+  const activeRevision = getActiveRevision(booking, pricing);
+
+  if (!activeRevision) {
+    throw new Error("No active pricing revision found for this booking date.");
+  }
+
+  let activeVolumes = activeRevision.volumes;
+
+  if (activeRevision.promotion) {
     const departureDate = booking.departureDate instanceof Date ? dayjs(booking.departureDate) : typeof booking.departureDate?.toDate === 'function' ? dayjs(booking.departureDate.toDate()) : null;
-    const startDate = pricing.promotion.startDate instanceof Date ? pricing.promotion.startDate : typeof pricing.promotion.startDate.toDate === 'function' ? pricing.promotion.startDate.toDate() : null;
-    const endDate = pricing.promotion.endDate instanceof Date ? pricing.promotion.endDate : typeof pricing.promotion.endDate.toDate === 'function' ? pricing.promotion.endDate.toDate() : null;
+    const startDate = activeRevision.promotion.startDate instanceof Date ? activeRevision.promotion.startDate : typeof activeRevision.promotion.startDate.toDate === 'function' ? activeRevision.promotion.startDate.toDate() : null;
+    const endDate = activeRevision.promotion.endDate instanceof Date ? activeRevision.promotion.endDate : typeof activeRevision.promotion.endDate.toDate === 'function' ? activeRevision.promotion.endDate.toDate() : null;
 
-    if (departureDate?.isBetween(startDate, endDate, "day", "[]")) {
-      pricing = { ...pricing, volumes: pricing.promotion.volumes };
+    if (departureDate?.isValid() && departureDate?.isBetween(dayjs(startDate), dayjs(endDate), "day", "[]")) {
+      activeVolumes = activeRevision.promotion.volumes;
     }
   }
 
-  const type = pricing.type;
+  const context = {
+    ...pricing,
+    volumes: activeVolumes
+  };
+
   let total = 0;
+  const type = context.type;
 
   switch (type) {
     case "person": {
-      const volume = findVolume(booking, pricing);
+      const volume = findVolume(booking, context);
       if (!volume) {
         console.error(`No volume price found for the total amount of ${booking.adults + booking.children} people`);
         return undefined;
@@ -96,13 +148,13 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
           const customPricing = volume[bookingSourceKey];
 
           if (options.mode === SELLING_MODE) {
-            const commissionRate = pricing.commissionRates?.[bookingSourceKey];
+            const commissionRate = context.commissionRates?.[bookingSourceKey];
             const baseNetPriceAdult = customPricing.adult.partnerNetPrice;
             const baseRetailPriceAdult = calculateSellingPrice(commissionRate, baseNetPriceAdult);
             const finalPriceAdult = calculateInflatedSellingPrice(baseRetailPriceAdult, customPricing);
 
             let finalPriceChild = 0;
-            if (pricing.ageBands.child.active && volume.child && booking.children) {
+            if (context.ageBands.child.active && volume.child && booking.children) {
               const baseNetPriceChild = customPricing.child.partnerNetPrice;
               const baseRetailPriceChild = calculateSellingPrice(commissionRate, baseNetPriceChild);
               finalPriceChild = calculateInflatedSellingPrice(baseRetailPriceChild, customPricing);
@@ -110,22 +162,22 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
 
             total = booking.adults * finalPriceAdult + (booking.children ? booking.children * finalPriceChild : 0);
           } else if (options.mode === PARTNER_MODE) {
-            total = booking.adults * customPricing.adult.partnerNetPrice + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * customPricing.child.partnerNetPrice : 0);
+            total = booking.adults * customPricing.adult.partnerNetPrice + (context.ageBands.child.active && volume.child && booking.children ? booking.children * customPricing.child.partnerNetPrice : 0);
           } else if (options.mode === OPERATOR_MODE) {
-            total = booking.adults * (customPricing.adult.operatorNetPrice ?? volume.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? (booking.children * (customPricing.child.operatorNetPrice ?? volume.child.operatorNetPrice)) : 0);
+            total = booking.adults * (customPricing.adult.operatorNetPrice ?? volume.adult.operatorNetPrice) + (context.ageBands.child.active && volume.child && booking.children ? (booking.children * (customPricing.child.operatorNetPrice ?? volume.child.operatorNetPrice)) : 0);
           }
         } else {
           if (options.mode === SELLING_MODE || options.mode === PARTNER_MODE) {
-            total = booking.adults * volume.adult.sellingPrice + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * volume.child.sellingPrice : 0);
+            total = booking.adults * volume.adult.sellingPrice + (context.ageBands.child.active && volume.child && booking.children ? booking.children * volume.child.sellingPrice : 0);
           } else if (options.mode === OPERATOR_MODE) {
-            total = booking.adults * volume.adult.operatorNetPrice + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * volume.child.operatorNetPrice : 0);
+            total = booking.adults * volume.adult.operatorNetPrice + (context.ageBands.child.active && volume.child && booking.children ? booking.children * volume.child.operatorNetPrice : 0);
           }
         }
         break;
       }
     }
     case "group": {
-      const volume = findVolume(booking, pricing);
+      const volume = findVolume(booking, context);
       if (!volume) {
         console.error(`No volume price found for the total amount of ${booking.adults + booking.children} people`);
         return undefined;
@@ -136,7 +188,7 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
           const customPricing = volume[bookingSourceKey];
 
           if (options.mode === SELLING_MODE) {
-            const commissionRate = pricing.commissionRates?.[bookingSourceKey];
+            const commissionRate = context.commissionRates?.[bookingSourceKey];
             const baseNetPrice = customPricing.partnerNetPrice;
             const baseRetailPrice = calculateSellingPrice(commissionRate, baseNetPrice);
             const finalPrice = calculateInflatedSellingPrice(baseRetailPrice, customPricing);
@@ -164,25 +216,34 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
   return total;
 }
 
-export function findVolume(people, pricing) {
+export function findVolume(people, context) {
   let total = (people.adults ?? 0) + (people.children ?? 0);
-  return [...pricing.volumes].sort((v1, v2) => v1.max - v2.max).find((item, i) => {
+
+  if (!context?.volumes || context.volumes.length === 0) return undefined;
+
+  const sortedVolumes = [...context.volumes].sort((v1, v2) => v1.max - v2.max);
+
+  return sortedVolumes.find((item, i) => {
     if (total <= item.max) {
       return true;
-    } else if (i === pricing.volumes.length - 1) {
+    }
+    else if (i === sortedVolumes.length - 1) {
       return true;
     }
+    return false;
   });
 }
 
 export function countMinPeople(pricing) {
-  let volume = pricing.volumes.map((item) => item.min);
-  return volume ? Math.max(volume.reduce((p, v) => p < v ? p : v), 1) : 1;
+  const volumes = pricing?.volumes?.map((item) => item.min) || [];
+  if (volumes.length === 0) return 1;
+  return Math.max(Math.min(...volumes), 1);
 }
 
 export function countMaxPeople(pricing) {
-  let volume = pricing.volumes.map((item) => item.max);
-  return volume ? volume.reduce((p, v) => p > v ? p : v) : MAX_PAX;
+  const volumes = pricing?.volumes?.map((item) => item.max) || [];
+  if (volumes.length === 0) return MAX_PAX;
+  return Math.max(...volumes);
 }
 
 export function getTotalAmountToBeReceived(booking, options = {}) {