tripstorekrabi-shared 1.23.9 → 1.24.1

package/package.json

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

package/price.js

@@ -27,7 +27,7 @@ const SELLING_MODE = 0;
 const PARTNER_MODE = 1;
 const OPERATOR_MODE = 2;
 
-export function getActiveRevision(booking, pricing) {
+export function getActiveRevision(date, pricing) {
   if (!pricing?.revisions || pricing.revisions.length === 0) return null;
 
   const getSafeDate = (dateField) => {
@@ -36,19 +36,27 @@ export function getActiveRevision(booking, pricing) {
     return dayjs(dateField);
   };
 
-  const bookingDate = getSafeDate(booking.date)?.startOf('day');
-  if (!bookingDate || !bookingDate.isValid()) return null;
+  const getSortedActive = () => [...pricing.revisions]
+    .filter(r => r.isActive !== false)
+    .sort((a, b) => getSafeDate(a.startDate)?.valueOf() - getSafeDate(b.startDate)?.valueOf());
+
+  const bookingDate = getSafeDate(date)?.startOf('day');
+
+  if (!bookingDate || !bookingDate.isValid()) {
+    return getSortedActive()[0] || pricing.revisions[0];
+  }
 
   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;
+  if (candidateRevisions.length === 0) {
+    return getSortedActive()[0] || pricing.revisions[0];
+  }
 
   return candidateRevisions.sort((a, b) => {
     const aTime = getSafeDate(a.startDate)?.valueOf() || 0;
@@ -57,8 +65,8 @@ export function getActiveRevision(booking, pricing) {
   })[0];
 }
 
-export function getActivePricing(booking, pricing) {
-  const activeRevision = getActiveRevision(booking, pricing);
+export function getActivePricing(date, pricing) {
+  const activeRevision = getActiveRevision(date, pricing);
 
   if (!activeRevision) {
     return pricing;
@@ -113,13 +121,14 @@ export function calculateInflatedSellingPrice(price, config, forceInflation = fa
 }
 
 function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE }) {
-  const activeRevision = getActiveRevision(booking, pricing);
+  const activeRevision = getActiveRevision(booking.date, pricing);
 
   if (!activeRevision) {
-    throw new Error("No active pricing revision found for this booking date.");
+    console.warn("Pricing fail-safe triggered: No active pricing revision found.");
+    return 0;
   }
 
-  let activeVolumes = activeRevision.volumes;
+  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;
@@ -127,10 +136,15 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
     const endDate = activeRevision.promotion.endDate instanceof Date ? activeRevision.promotion.endDate : typeof activeRevision.promotion.endDate.toDate === 'function' ? activeRevision.promotion.endDate.toDate() : null;
 
     if (departureDate?.isValid() && departureDate?.isBetween(dayjs(startDate), dayjs(endDate), "day", "[]")) {
-      activeVolumes = activeRevision.promotion.volumes;
+      activeVolumes = activeRevision.promotion.volumes || [];
     }
   }
 
+  if (activeVolumes.length === 0) {
+    console.warn("Pricing fail-safe triggered: Active revision has no volumes.");
+    return 0;
+  }
+
   const context = {
     ...pricing,
     volumes: activeVolumes
@@ -144,7 +158,7 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
       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;
+        return 0;
       } else {
         const bookingSourceKey = getBookingSourceKey(booking.otaPartnerRef);
 
@@ -184,7 +198,7 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
       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;
+        return 0;
       } else {
         const bookingSourceKey = getBookingSourceKey(booking.otaPartnerRef);
 
@@ -443,7 +457,8 @@ export function getExtraPaymentsOperatorPrice(extraPayments) {
 
 export function calculateAddOnsPrice(booking, product, options = { mode: SELLING_MODE }) {
   let total = 0;
-  let isSelling = options.mode in [SELLING_MODE, PARTNER_MODE];
+  let isSelling = [SELLING_MODE, PARTNER_MODE].includes(options.mode);
+
   for (const [id, addOn] of Object.entries(booking.addOns ?? {})) {
     let addOnDef = findAddOn(id, product.addOns ?? []);
     if (addOnDef) {
@@ -471,7 +486,7 @@ export function calculateStartEndPointPartnerNetPrice(people, startEndPoint) {
 
 function calculateStartEndPointPrice(people, startEndPoint, options = { mode: SELLING_MODE }) {
   let pricing = startEndPoint?.pricing;
-  let isSelling = options.mode in [SELLING_MODE, PARTNER_MODE];
+  let isSelling = [SELLING_MODE, PARTNER_MODE].includes(options.mode);
   if (pricing) {
     if (pricing.type === "group") {
       return (isSelling ? (pricing.sellingPrice ?? pricing.amount) : pricing.operatorNetPrice) * Math.ceil((people.adults + people.children) / pricing.max);