tripstorekrabi-shared 1.13.39 → 1.13.41

package/package.json

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

package/price.js

@@ -17,23 +17,23 @@ export const EXTRA_PAYMENT_CATEGORIES = [STARTING_POINT_EXTRA_PAYMENT,
   ADD_ON_EXTRA_PAYMENT,
   OTHER_EXTRA_PAYMENT];
 
-const SELLING_PAYMENT_MODE = 0;
-const PARTNER_PAYMENT_MODE = 1;
-const OPERATOR_PAYMENT_MODE = 2;
+const SELLING_MODE = 0;
+const PARTNER_MODE = 1;
+const OPERATOR_MODE = 2;
 
 export function calculateProductSellingPrice(booking, pricing) {
-  return calculateProductPrice(booking, pricing, { paymentMode: SELLING_PAYMENT_MODE });
+  return calculateProductPrice(booking, pricing, { mode: SELLING_MODE });
 }
 
 export function calculateProductPartnerNetPrice(booking, pricing) {
-  return calculateProductPrice(booking, pricing, { paymentMode: PARTNER_PAYMENT_MODE });
+  return calculateProductPrice(booking, pricing, { mode: PARTNER_MODE });
 }
 
 export function calculateProductOperatorPrice(booking, pricing) {
-  return calculateProductPrice(booking, pricing, { paymentMode: OPERATOR_PAYMENT_MODE });
+  return calculateProductPrice(booking, pricing, { mode: OPERATOR_MODE });
 }
 
-export function calculateProductPrice(booking, pricing, options = { paymentMode: SELLING_PAYMENT_MODE }) {
+function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE }) {
   function calculateRetailPrice(commissionRate, price) {
     return Math.floor(
       (price * 100) /
@@ -56,7 +56,7 @@ export function calculateProductPrice(booking, pricing, options = { paymentMode:
         if (volume[bookingType]) {
           let customPricing = volume[bookingType];
 
-          if (options.paymentMode === SELLING_PAYMENT_MODE) {
+          if (options.mode === SELLING_MODE) {
             let commissionRate = pricing.commissionRates?.[bookingType];
 
             if (commissionRate && commissionRate > 0) {
@@ -64,15 +64,15 @@ export function calculateProductPrice(booking, pricing, options = { paymentMode:
             } else {
               total = booking.adults * customPricing.adult.retailPrice + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * customPricing.child.retailPrice : 0);
             }
-          } else if (options.paymentMode === PARTNER_PAYMENT_MODE) {
+          } 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);
-          } else if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
+          } 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);
           }
         } else {
-          if (options.paymentMode === SELLING_PAYMENT_MODE || options.paymentMode === PARTNER_PAYMENT_MODE) {
+          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);
-          } else if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
+          } 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);
           }
         }
@@ -91,7 +91,7 @@ export function calculateProductPrice(booking, pricing, options = { paymentMode:
         if (volume[bookingType]) {
           let customPricing = volume[bookingType];
 
-          if (options.paymentMode === SELLING_PAYMENT_MODE) {
+          if (options.mode === SELLING_MODE) {
             let commissionRate = pricing.commissionRates?.[bookingType];
 
             if (commissionRate && commissionRate > 0) {
@@ -99,15 +99,15 @@ export function calculateProductPrice(booking, pricing, options = { paymentMode:
             } else {
               total = customPricing.retailPrice;
             }
-          } else if (options.paymentMode === PARTNER_PAYMENT_MODE) {
+          } else if (options.mode === PARTNER_MODE) {
             total = customPricing.partnerNetPrice
-          } else if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
+          } else if (options.mode === OPERATOR_MODE) {
             total = customPricing.operatorNetPrice ?? volume.operatorNetPrice;
           }
         } else {
-          if (options.paymentMode === SELLING_PAYMENT_MODE || options.paymentMode === PARTNER_PAYMENT_MODE) {
+          if (options.mode === SELLING_MODE || options.mode === PARTNER_MODE) {
             total = volume.sellingPrice;
-          } else if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
+          } else if (options.mode === OPERATOR_MODE) {
             total = volume.operatorNetPrice;
           }
         }
@@ -155,34 +155,54 @@ export function calculatePartnerNetPrice(booking, product) {
     product
   ).reduce(
     (prev, curr) => prev + curr.price,
-    calculateProductPrice(
+    calculateProductPartnerNetPrice(
       booking,
-      product.pricing,
-      {
-        paymentMode: PARTNER_PAYMENT_MODE,
-      }
+      product.pricing
     )
   );
 }
 
 export function calculateTotalSellingPrice(booking, product) {
-  return calculateTotalPrice(booking, product, options = { paymentMode: SELLING_PAYMENT_MODE });
+  return calculateTotalPrice(booking, product, options = { mode: SELLING_MODE });
 }
 
 export function calculateTotalOperatorPrice(booking, product) {
-  return calculateTotalPrice(booking, product, options = { paymentMode: OPERATOR_PAYMENT_MODE });
+  return calculateTotalPrice(booking, product, options = { mode: OPERATOR_MODE });
 }
 
 export function calculateTotalPartnerNetPrice(booking, product) {
-  return calculateTotalPrice(booking, product, options = { paymentMode: PARTNER_PAYMENT_MODE });
+  return calculateTotalPrice(booking, product, options = { mode: PARTNER_MODE });
 }
 
-function calculateTotalPrice(booking, product, options = { paymentMode: SELLING_PAYMENT_MODE }) {
+function calculateTotalPrice(booking, product, options = { mode: SELLING_MODE }) {
   let total = calculateProductPrice(booking, product.pricing, options);
   total += calculateStartEndPointPrice(booking, findStartingPoint(product, booking.startingPointId, false), options);
   total += calculateStartEndPointPrice(booking, findEndPoint(product, booking.endPointId, false), options);
   total += calculateNationalParkFee(booking, product);
-  total += calculateExtraPayments(booking, { ...options, calculationMode: true });
+  total += calculateExtraPayments(booking, {
+    ...options,
+    calculationMode: true,
+    filter: (item) => {
+      if (item.disabled === true) {
+        return false;
+      } else if (item.paymentMethod === PAY_ON_TOUR) {
+        return true;
+      } else if (item.paymentMethod === PAY_BEFORE && item.category === OTHER_EXTRA_PAYMENT) {
+        return true;
+      }
+    },
+    getPrice: (item, options) => {
+      if (item.paymentMethod === PAY_ON_TOUR) {
+        if (item.category !== OTHER_EXTRA_PAYMENT) {
+          return -getExtraPaymentPrice(item, options);
+        } else {
+          return 0;
+        }
+      } else {
+        return getExtraPaymentPrice(item, options);
+      }
+    }
+  });
   total += calculateAddOnsPrice(booking, product, options);
   return total;
 }
@@ -191,32 +211,29 @@ export function calculateNationalParkFee(booking, product) {
   return booking.nationalParkFee === ALREADY_PAID && product.nationalPark ? product.nationalPark.pricing.adult * booking.adults + product.nationalPark.pricing.child * booking.children : 0;
 }
 
-export function calculateExtraPayments(booking, options = { paymentMode: SELLING_PAYMENT_MODE, calculationMode: false }) {
-  function getPrice(item) {
-    switch (options.paymentMode) {
-      case SELLING_PAYMENT_MODE:
-      case PARTNER_PAYMENT_MODE:
-        return item.receivedAmount ? item.receivedAmount : item.price;
-      case OPERATOR_PAYMENT_MODE:
-        return item.operatoPrice;
-    }
+function getExtraPaymentPrice(item, options) {
+  switch (options.mode) {
+    case SELLING_MODE:
+    case PARTNER_MODE:
+      return item.receivedAmount ? item.receivedAmount : item.price;
+    case OPERATOR_MODE:
+      return item.operatoPrice;
   }
+}
+
+export function calculateExtraPayments(booking, options = { mode: SELLING_MODE }) {
+  let filter = options.filter ?? ((item) => !item.disabled);
+  let getPrice = options.getPrice ?? getExtraPaymentPrice;
 
   let total = 0;
-  for (const item of Object.values(booking.extraPayments).filter((item) => !item.disabled)) {
-    if (item.paymentMethod === PAY_ON_TOUR) {
-      if (options.calculationMode && item.category !== OTHER_EXTRA_PAYMENT) {
-        total -= getPrice(item, options);
-      }
+  for (const item of Object.values(booking.extraPayments).filter(filter)) {
+    total += getPrice(item, options);
 
-      if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
-        let ourCommission = item.price - item.operatorPrice;
-        if (ourCommission > 0) {
-          total -= ourCommission;
-        }
+    if (item.paymentMethod === PAY_ON_TOUR && options.mode === OPERATOR_MODE) {
+      let ourCommission = item.price - item.operatorPrice;
+      if (ourCommission > 0) {
+        total -= ourCommission;
       }
-    } else if (!options.calculationMode || item.category === OTHER_EXTRA_PAYMENT) {
-      total += getPrice(item, options);
     }
   }
 
@@ -247,14 +264,14 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
     {
       category: STARTING_POINT_EXTRA_PAYMENT,
       description: startingPoint.name,
-      price: calculateStartEndPointPrice(booking, startingPoint, { paymentMode: SELLING_PAYMENT_MODE }),
-      operatorPrice: calculateStartEndPointPrice(booking, startingPoint, { paymentMode: OPERATOR_PAYMENT_MODE }),
+      price: calculateStartEndPointSellingPrice(booking, startingPoint),
+      operatorPrice: calculateStartEndPointOperatorPrice(booking, startingPoint),
     },
     {
       category: END_POINT_EXTRA_PAYMENT,
       description: endPoint.name,
-      price: calculateStartEndPointPrice(booking, endPoint, { paymentMode: SELLING_PAYMENT_MODE }),
-      operatorPrice: calculateStartEndPointPrice(booking, endPoint, { paymentMode: OPERATOR_PAYMENT_MODE }),
+      price: calculateStartEndPointSellingPrice(booking, endPoint),
+      operatorPrice: calculateStartEndPointOperatorPrice(booking, endPoint),
     },
     {
       category: NATIONAL_PARK_FEE_EXTRA_PAYMENT,
@@ -273,9 +290,9 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
   );
 }
 
-export function calculateAddOnsPrice(booking, product, options = { paymentMode: SELLING_PAYMENT_MODE }) {
+export function calculateAddOnsPrice(booking, product, options = { mode: SELLING_MODE }) {
   let total = 0;
-  let isSelling = options.paymentMode in [SELLING_PAYMENT_MODE, PARTNER_PAYMENT_MODE];
+  let isSelling = options.mode in [SELLING_MODE, PARTNER_MODE];
   for (const [id, addOn] of Object.entries(booking.addOns ?? {})) {
     let addOnDef = findAddOn(id, product.addOns ?? []);
     if (addOnDef) {
@@ -290,20 +307,20 @@ export function calculateAddOnsPrice(booking, product, options = { paymentMode:
 }
 
 export function calculateStartEndPointSellingPrice(people, startEndPoint) {
-  return calculateStartEndPointPrice(people, startEndPoint, { paymentMode: SELLING_PAYMENT_MODE });
+  return calculateStartEndPointPrice(people, startEndPoint, { mode: SELLING_MODE });
 }
 
 export function calculateStartEndPointOperatorPrice(people, startEndPoint) {
-  return calculateStartEndPointPrice(people, startEndPoint, { paymentMode: OPERATOR_PAYMENT_MODE });
+  return calculateStartEndPointPrice(people, startEndPoint, { mode: OPERATOR_MODE });
 }
 
 export function calculateStartEndPointPartnerNetPrice(people, startEndPoint) {
-  return calculateStartEndPointPrice(people, startEndPoint, { paymentMode: PARTNER_PAYMENT_MODE });
+  return calculateStartEndPointPrice(people, startEndPoint, { mode: PARTNER_MODE });
 }
 
-function calculateStartEndPointPrice(people, startEndPoint, options = { paymentMode: SELLING_PAYMENT_MODE }) {
+function calculateStartEndPointPrice(people, startEndPoint, options = { mode: SELLING_MODE }) {
   let pricing = startEndPoint?.pricing;
-  let isSelling = options.paymentMode in [SELLING_PAYMENT_MODE, PARTNER_PAYMENT_MODE];
+  let isSelling = options.mode in [SELLING_MODE, PARTNER_MODE];
   if (pricing) {
     if (pricing.type === "group") {
       return (isSelling ? pricing.sellingPrice : pricing.operatorNetPrice) * Math.ceil((people.adults + people.children) / pricing.max);

package/product.js

@@ -1,4 +1,4 @@
-import { calculateProductPrice, countMinPeople } from "./price.js";
+import { calculateProductSellingPrice, countMinPeople } from "./price.js";
 
 const MATCH_HTML_REGEXP = /(<([^>]+)>)/ig;
 
@@ -12,7 +12,7 @@ export function buildIndex(id, product) {
     heroPhoto: product.heroPhoto,
     operator: product.operator.default.name,
     url: product.url,
-    price: calculateProductPrice({ adults: countMinPeople(product.pricing), children: 0, infants: 0 }, product.pricing) / countMinPeople(product.pricing),
+    price: calculateProductSellingPrice({ adults: countMinPeople(product.pricing), children: 0, infants: 0 }, product.pricing) / countMinPeople(product.pricing),
     priceType: product.pricing.type,
     availability: product.availability
   };