tripstorekrabi-shared 1.13.37 → 1.13.39

package/booking.js

@@ -2,7 +2,7 @@ import dayjs from "dayjs";
 import advancedFormat from 'dayjs/plugin/advancedFormat.js';
 import utc from "dayjs/plugin/utc.js";
 import timezone from "dayjs/plugin/timezone.js";
-import { calculateTotalPrice } from './price.js';
+import { calculateTotalOperatorPrice } from './price.js';
 
 dayjs.extend(advancedFormat);
 dayjs.extend(utc);
@@ -106,7 +106,7 @@ export function addBookingFromInvoice(firestore, admin, invoice, paymentData, co
           }
 
           if (productSnapshot) {
-            data.operatorNetPrice = calculateTotalPrice(data, productSnapshot.data(), "operator");
+            data.operatorNetPrice = calculateTotalOperatorPrice(data, productSnapshot.data());
           } else {
             data.operatorNetPrice = 0;
           }

package/package.json

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

package/price.js

@@ -1,8 +1,5 @@
 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";
@@ -20,6 +17,10 @@ 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;
+
 export function calculateProductSellingPrice(booking, pricing) {
   return calculateProductPrice(booking, pricing, { paymentMode: SELLING_PAYMENT_MODE });
 }
@@ -246,14 +247,14 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
     {
       category: STARTING_POINT_EXTRA_PAYMENT,
       description: startingPoint.name,
-      price: calculateStartEndPointPrice(booking, startingPoint, true),
-      operatorPrice: calculateStartEndPointPrice(booking, startingPoint, false),
+      price: calculateStartEndPointPrice(booking, startingPoint, { paymentMode: SELLING_PAYMENT_MODE }),
+      operatorPrice: calculateStartEndPointPrice(booking, startingPoint, { paymentMode: OPERATOR_PAYMENT_MODE }),
     },
     {
       category: END_POINT_EXTRA_PAYMENT,
       description: endPoint.name,
-      price: calculateStartEndPointPrice(booking, endPoint, true),
-      operatorPrice: calculateStartEndPointPrice(booking, endPoint, false),
+      price: calculateStartEndPointPrice(booking, endPoint, { paymentMode: SELLING_PAYMENT_MODE }),
+      operatorPrice: calculateStartEndPointPrice(booking, endPoint, { paymentMode: OPERATOR_PAYMENT_MODE }),
     },
     {
       category: NATIONAL_PARK_FEE_EXTRA_PAYMENT,
@@ -288,7 +289,19 @@ export function calculateAddOnsPrice(booking, product, options = { paymentMode:
   return total;
 }
 
-export function calculateStartEndPointPrice(people, startEndPoint, options = { paymentMode: SELLING_PAYMENT_MODE }) {
+export function calculateStartEndPointSellingPrice(people, startEndPoint) {
+  return calculateStartEndPointPrice(people, startEndPoint, { paymentMode: SELLING_PAYMENT_MODE });
+}
+
+export function calculateStartEndPointOperatorPrice(people, startEndPoint) {
+  return calculateStartEndPointPrice(people, startEndPoint, { paymentMode: OPERATOR_PAYMENT_MODE });
+}
+
+export function calculateStartEndPointPartnerNetPrice(people, startEndPoint) {
+  return calculateStartEndPointPrice(people, startEndPoint, { paymentMode: PARTNER_PAYMENT_MODE });
+}
+
+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) {