tripstorekrabi-shared 1.13.14 → 1.13.16

package/package.json

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

package/price.js

@@ -117,7 +117,7 @@ export function getTotalAmountToBeReceived(booking) {
   if (booking.customerPaymentStatus === "Refunded") {
     total = 0;
   } else {
-    total = calculateExtraPayments(booking, true);
+    total = booking.partnerNetPrice + calculateExtraPayments(booking, true);
   }
 
   return total;
@@ -129,7 +129,7 @@ export function getTotalOperatorNetPrice(booking) {
   if (booking.operatorPaymentStatus === "No Charge") {
     total = 0;
   } else {
-    total = calculateExtraPayments(booking, false);
+    total = booking.operatorNetPrice + calculateExtraPayments(booking, false);
   }
 
   return total;
@@ -151,27 +151,27 @@ export function calculateNationalParkFee(booking, product) {
 
 export function calculateExtraPayments(booking, selling = true, calculationMode = false) {
   let total = 0;
-  for (const extraPayment of Object.values(booking.extraPayments ?? {}).filter((item) => !item.disabled)) {
+  for (const item of Object.values(booking.extraPayments ?? {}).filter((item) => !item.disabled)) {
     if (selling) {
-      if (extraPayment.paymentMethod === PAY_ON_TOUR) {
+      if (item.paymentMethod === PAY_ON_TOUR) {
         if (calculationMode && item.category !== "OTHER") {
-          total -= extraPayment.price;
+          total -= item.price;
         }
       } else if (!calculationMode || item.category === "OTHER") {
-        total += extraPayment.receivedAmount ? extraPayment.receivedAmount : extraPayment.price;
+        total += item.receivedAmount ? item.receivedAmount : item.price;
       }
     } else {
-      if (extraPayment.paymentMethod === PAY_ON_TOUR) {
+      if (item.paymentMethod === PAY_ON_TOUR) {
         if (calculationMode && item.category !== "OTHER") {
-          total -= extraPayment.operatorPrice;
+          total -= item.operatorPrice;
         }
 
-        let ourCommission = extraPayment.price - extraPayment.operatorPrice;
+        let ourCommission = item.price - item.operatorPrice;
         if (ourCommission > 0) {
           total -= ourCommission;
         }
       } else if (!calculationMode || item.category === "OTHER") {
-        total += extraPayment.operatorPrice;
+        total += item.operatorPrice;
       }
     }
   }