tripstorekrabi-shared 1.13.13 → 1.13.14

package/package.json

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

package/price.js

@@ -112,11 +112,27 @@ export function countMaxPeople(pricing) {
 }
 
 export function getTotalAmountToBeReceived(booking) {
-  return booking.customerPaymentStatus === "Refunded" ? 0 : booking.partnerNetPrice + calculateExtraPayments(booking, true);
+  let total;
+
+  if (booking.customerPaymentStatus === "Refunded") {
+    total = 0;
+  } else {
+    total = calculateExtraPayments(booking, true);
+  }
+
+  return total;
 }
 
 export function getTotalOperatorNetPrice(booking) {
-  return booking.operatorPaymentStatus === "No Charge" ? 0 : booking.operatorNetPrice + calculateExtraPayments(booking, false);
+  let total;
+
+  if (booking.operatorPaymentStatus === "No Charge") {
+    total = 0;
+  } else {
+    total = calculateExtraPayments(booking, false);
+  }
+
+  return total;
 }
 
 export function calculateTotalPrice(booking, product, mode = "retail") {
@@ -133,18 +149,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, selling = true, excludePaymentsWithCategory = false) {
+export function calculateExtraPayments(booking, selling = true, calculationMode = false) {
   let total = 0;
-  if (booking.extraPayments) {
-    for (const extraPayment of Object.values(booking.extraPayments).filter((item) => !item.disabled && (!excludePaymentsWithCategory || item.category === "OTHER"))) {
-      if (!selling) {
-        if (extraPayment.paymentMethod === PAY_ON_TOUR) {
-          total -= extraPayment.price - extraPayment.operatorPrice;
-        } else {
-          total += extraPayment.operatorPrice;
+  for (const extraPayment of Object.values(booking.extraPayments ?? {}).filter((item) => !item.disabled)) {
+    if (selling) {
+      if (extraPayment.paymentMethod === PAY_ON_TOUR) {
+        if (calculationMode && item.category !== "OTHER") {
+          total -= extraPayment.price;
+        }
+      } else if (!calculationMode || item.category === "OTHER") {
+        total += extraPayment.receivedAmount ? extraPayment.receivedAmount : extraPayment.price;
+      }
+    } else {
+      if (extraPayment.paymentMethod === PAY_ON_TOUR) {
+        if (calculationMode && item.category !== "OTHER") {
+          total -= extraPayment.operatorPrice;
+        }
+
+        let ourCommission = extraPayment.price - extraPayment.operatorPrice;
+        if (ourCommission > 0) {
+          total -= ourCommission;
         }
-      } else if (extraPayment.paymentMethod !== PAY_ON_TOUR) {
-        total += extraPayment.receivedAmount ? extraPayment.receivedAmount : extraPayment.price
+      } else if (!calculationMode || item.category === "OTHER") {
+        total += extraPayment.operatorPrice;
       }
     }
   }