tripstorekrabi-shared 1.13.46 → 1.13.48

package/package.json

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

package/price.js

@@ -22,25 +22,26 @@ const PARTNER_MODE = 1;
 const OPERATOR_MODE = 2;
 
 export function calculateProductSellingPrice(booking, pricing) {
-  return calculateProductPrice(booking, pricing, { mode: SELLING_MODE });
+  return booking.customerPaymentStatus === "Refunded" ? 0 : calculateProductPrice(booking, pricing, { mode: SELLING_MODE });
 }
 
 export function calculateProductPartnerNetPrice(booking, pricing) {
-  return calculateProductPrice(booking, pricing, { mode: PARTNER_MODE });
+  return booking.customerPaymentStatus === "Refunded" ? 0 : calculateProductPrice(booking, pricing, { mode: PARTNER_MODE });
 }
 
 export function calculateProductOperatorPrice(booking, pricing) {
-  return calculateProductPrice(booking, pricing, { mode: OPERATOR_MODE });
+  return booking.operatorPaymentStatus === "No Charge" ? 0 : calculateProductPrice(booking, pricing, { mode: OPERATOR_MODE });
+}
+
+function calculateSellingPrice(commissionRate, price) {
+  return Math.floor(
+    (price * 100) /
+    (100 -
+      commissionRate)
+  );
 }
 
 function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE }) {
-  function calculateRetailPrice(commissionRate, price) {
-    return Math.floor(
-      (price * 100) /
-      (100 -
-        commissionRate)
-    );
-  }
   let type = pricing.type;
   let total = 0;
 
@@ -60,7 +61,7 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_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);
+              total = booking.adults * calculateSellingPrice(commissionRate, customPricing.adult.partnerNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? (booking.children * calculateSellingPrice(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);
             }
@@ -95,7 +96,7 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
             let commissionRate = pricing.commissionRates?.[bookingType];
 
             if (commissionRate && commissionRate > 0) {
-              total = calculateRetailPrice(commissionRate, customPricing.partnerNetPrice);
+              total = calculateSellingPrice(commissionRate, customPricing.partnerNetPrice);
             } else {
               total = customPricing.retailPrice;
             }
@@ -138,15 +139,7 @@ export function countMaxPeople(pricing) {
 }
 
 export function getTotalAmountToBeReceived(booking, options = {}) {
-  let total;
-
-  if (booking.customerPaymentStatus === "Refunded") {
-    total = 0;
-  } else {
-    total = booking.partnerNetPrice + calculateExtraPayments(booking, { mode: SELLING_MODE, ...options });
-  }
-
-  return total;
+  return booking.customerPaymentStatus === "Refunded" ? 0 : booking.partnerNetPrice + calculateExtraPayments(booking, { mode: SELLING_MODE, ...options })
 }
 
 export function calculatePartnerNetPrice(booking, product) {