tripstorekrabi-shared 1.13.31 → 1.13.33

package/package.json

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

package/price.js

@@ -1,5 +1,8 @@
 import { getBookingType } from "./utils.js";
 
+export const SELLING_PAYMENT_MODE = 0;
+export const PARTNER_PAYMENT_MODE = 1;
+export const OPERATOR_PAYMENT_MODE = 2;
 export const MAX_PAX = 30;
 export const PAY_ON_TOUR = 'Pay on tour';
 export const ALREADY_PAID = "Already paid";
@@ -17,7 +20,14 @@ export const EXTRA_PAYMENT_CATEGORIES = [STARTING_POINT_EXTRA_PAYMENT,
   ADD_ON_EXTRA_PAYMENT,
   OTHER_EXTRA_PAYMENT];
 
-export function calculateProductPrice(booking, pricing, mode = "retail") {
+export function calculateProductPrice(booking, pricing, options = { paymentMode: SELLING_PAYMENT_MODE }) {
+  function calculateRetailPrice(commissionRate, price) {
+    return Math.floor(
+      (price * 100) /
+      (100 -
+        commissionRate)
+    );
+  }
   let type = pricing.type;
   let total = 0;
 
@@ -33,24 +43,24 @@ export function calculateProductPrice(booking, pricing, mode = "retail") {
         if (volume[bookingType]) {
           let customPricing = volume[bookingType];
 
-          if (mode === "retail") {
+          if (options.paymentMode === SELLING_PAYMENT_MODE) {
             let commissionRate = pricing.commissionRates?.[bookingType];
 
             if (commissionRate && commissionRate > 0) {
               total = booking.adults * calculateRetailPrice(commissionRate, customPricing.adult.partnerNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? (booking.children * calculateRetailPrice(commissionRate, customPricing.child.partnerNetPrice)) : 0);
             } else {
-              total = booking.adults * customPricing.adult.retailPrice + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (customPricing.child.retailPrice) : 0);
+              total = booking.adults * customPricing.adult.retailPrice + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * customPricing.child.retailPrice : 0);
             }
-          } else if (mode === "partner") {
-            total = booking.adults * (customPricing.adult.partnerNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (customPricing.child.partnerNetPrice) : 0);
-          } else if (mode === "operator") {
+          } else if (options.paymentMode === PARTNER_PAYMENT_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) {
             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 (mode === "retail" || mode === "partner") {
-            total = booking.adults * (volume.adult.sellingPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (volume.child.sellingPrice) : 0);
-          } else if (mode === "operator") {
-            total = booking.adults * (volume.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (volume.child.operatorNetPrice) : 0);
+          if (options.paymentMode === SELLING_PAYMENT_MODE || options.paymentMode === PARTNER_PAYMENT_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) {
+            total = booking.adults * volume.adult.operatorNetPrice + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * volume.child.operatorNetPrice : 0);
           }
         }
         break;
@@ -68,7 +78,7 @@ export function calculateProductPrice(booking, pricing, mode = "retail") {
         if (volume[bookingType]) {
           let customPricing = volume[bookingType];
 
-          if (mode === "retail") {
+          if (options.paymentMode === SELLING_PAYMENT_MODE) {
             let commissionRate = pricing.commissionRates?.[bookingType];
 
             if (commissionRate && commissionRate > 0) {
@@ -76,15 +86,15 @@ export function calculateProductPrice(booking, pricing, mode = "retail") {
             } else {
               total = customPricing.retailPrice;
             }
-          } else if (mode === "partner") {
+          } else if (options.paymentMode === PARTNER_PAYMENT_MODE) {
             total = customPricing.partnerNetPrice
-          } else if (mode === "operator") {
+          } else if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
             total = customPricing.operatorNetPrice ?? volume.operatorNetPrice;
           }
         } else {
-          if (mode === "retail" || mode === "partner") {
+          if (options.paymentMode === SELLING_PAYMENT_MODE || options.paymentMode === PARTNER_PAYMENT_MODE) {
             total = volume.sellingPrice;
-          } else if (mode === "operator") {
+          } else if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
             total = volume.operatorNetPrice;
           }
         }
@@ -99,14 +109,6 @@ export function calculateProductPrice(booking, pricing, mode = "retail") {
   return total;
 }
 
-function calculateRetailPrice(commissionRate, price) {
-  return Math.floor(
-    (price * 100) /
-    (100 -
-      commissionRate)
-  );
-}
-
 export function findVolume(people, pricing) {
   let total = people.adults + people.children ?? 0;
   return pricing.volumes.sort((v1, v2) => v1.max - v2.max).find((item) => total <= item.max);
@@ -128,7 +130,7 @@ export function getTotalAmountToBeReceived(booking) {
   if (booking.customerPaymentStatus === "Refunded") {
     total = 0;
   } else {
-    total = booking.partnerNetPrice + calculateExtraPayments(booking, true);
+    total = booking.partnerNetPrice + calculateExtraPayments(booking);
   }
 
   return total;
@@ -143,18 +145,20 @@ export function calculatePartnerNetPrice(booking, product) {
     calculateProductPrice(
       booking,
       product.pricing,
-      'partner'
+      {
+        paymentMode: PARTNER_PAYMENT_MODE,
+      }
     )
   );
 }
 
-export function calculateTotalPrice(booking, product, mode = "retail") {
-  let total = calculateProductPrice(booking, product.pricing, mode);
-  total += calculateStartEndPointPrice(booking, findStartingPoint(product, booking.startingPointId, false), mode === "retail" || mode === "partner");
-  total += calculateStartEndPointPrice(booking, findEndPoint(product, booking.endPointId, false), mode === "retail" || mode === "partner");
+export function calculateTotalPrice(booking, product, options = { paymentMode: SELLING_PAYMENT_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, mode === "retail" || mode === "partner", true);
-  total += calculateAddOnsPrice(booking, product, mode === "retail" || mode === "partner");
+  total += calculateExtraPayments(booking, { ...options, calculationMode: true });
+  total += calculateAddOnsPrice(booking, product, options);
   return total;
 }
 
@@ -162,32 +166,35 @@ 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, selling = true, calculationMode = false) {
+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;
+    }
+  }
+
   let total = 0;
   for (const item of Object.values(booking.extraPayments).filter((item) => !item.disabled)) {
-    if (selling) {
-      if (item.paymentMethod === PAY_ON_TOUR) {
-        if (calculationMode && item.category !== OTHER_EXTRA_PAYMENT) {
-          total -= item.price;
-        }
-      } else if (!calculationMode || item.category === OTHER_EXTRA_PAYMENT) {
-        total += item.receivedAmount ? item.receivedAmount : item.price;
+    if (item.paymentMethod === PAY_ON_TOUR) {
+      if (options.calculationMode && item.category !== OTHER_EXTRA_PAYMENT) {
+        total -= getPrice(item, options);
       }
-    } else {
-      if (item.paymentMethod === PAY_ON_TOUR) {
-        if (calculationMode && item.category !== OTHER_EXTRA_PAYMENT) {
-          total -= item.operatorPrice;
-        }
 
+      if (options.paymentMode === OPERATOR_PAYMENT_MODE) {
         let ourCommission = item.price - item.operatorPrice;
         if (ourCommission > 0) {
           total -= ourCommission;
         }
-      } else if (!calculationMode || item.category === OTHER_EXTRA_PAYMENT) {
-        total += item.operatorPrice;
       }
+    } else if (!options.calculationMode || item.category === OTHER_EXTRA_PAYMENT) {
+      total += getPrice(item, options);
     }
   }
+
   return total;
 }
 
@@ -198,7 +205,7 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
   (product.addOns ?? []).forEach((addOn) => {
     addOnDefs[addOn.id] = addOn;
   });
-  let addOns = Object.entries(booking.addOns).filter(([id]) => addOnDefs[id] != null).map(([id, addOn]) => {
+  let addOns = Object.entries(booking.addOns ?? {}).filter(([id]) => addOnDefs[id] != null).map(([id, addOn]) => {
     let addOnDef = addOnDefs[id];
 
     return {
@@ -241,30 +248,30 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
   );
 }
 
-export function calculateAddOnsPrice(booking, product, selling = true) {
+export function calculateAddOnsPrice(booking, product, options = { paymentMode: SELLING_PAYMENT_MODE }) {
   let total = 0;
-  if (booking.addOns) {
-    for (const [id, addOn] of Object.entries(booking.addOns)) {
-      let addOnDef = findAddOn(id, product.addOns);
-      if (addOnDef) {
-        total += addOn.adults * (selling ? addOnDef.pricing.adult
-          .sellingPrice : addOnDef.pricing.adult
-          .operatorNetPrice) + (addOn.children > 0 ? addOn.children * (selling ? addOnDef.pricing.child
-            .sellingPrice : addOnDef.pricing.child
-            .operatorNetPrice) : 0);
-      }
+  let isSelling = options.paymentMode in [SELLING_PAYMENT_MODE, PARTNER_PAYMENT_MODE];
+  for (const [id, addOn] of Object.entries(booking.addOns ?? {})) {
+    let addOnDef = findAddOn(id, product.addOns ?? []);
+    if (addOnDef) {
+      total += addOn.adults * (isSelling ? addOnDef.pricing.adult
+        .sellingPrice : addOnDef.pricing.adult
+        .operatorNetPrice) + (addOn.children > 0 ? addOn.children * (isSelling ? addOnDef.pricing.child
+          .sellingPrice : addOnDef.pricing.child
+          .operatorNetPrice) : 0);
     }
   }
   return total;
 }
 
-export function calculateStartEndPointPrice(people, startEndPoint, selling = true) {
+export function calculateStartEndPointPrice(people, startEndPoint, options = { paymentMode: SELLING_PAYMENT_MODE }) {
   let pricing = startEndPoint?.pricing;
+  let isSelling = options.paymentMode in [SELLING_PAYMENT_MODE, PARTNER_PAYMENT_MODE];
   if (pricing) {
     if (pricing.type === "group") {
-      return (selling ? pricing.sellingPrice : pricing.operatorNetPrice) * Math.ceil((people.adults + people.children) / pricing.max);
+      return (isSelling ? pricing.sellingPrice : pricing.operatorNetPrice) * Math.ceil((people.adults + people.children) / pricing.max);
     } else if (pricing.type === "person") {
-      return (selling ? pricing.sellingPrice : pricing.operatorNetPrice) * (people.adults + people.children);
+      return (isSelling ? pricing.sellingPrice : pricing.operatorNetPrice) * (people.adults + people.children);
     }
   } else {
     return 0;