tripstorekrabi-shared 1.13.38 → 1.13.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.13.38",
+  "version": "1.13.40",
   "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 });
 }
@@ -32,7 +33,7 @@ export function calculateProductOperatorPrice(booking, pricing) {
   return calculateProductPrice(booking, pricing, { paymentMode: OPERATOR_PAYMENT_MODE });
 }
 
-export function calculateProductPrice(booking, pricing, options = { paymentMode: SELLING_PAYMENT_MODE }) {
+function calculateProductPrice(booking, pricing, options = { paymentMode: SELLING_PAYMENT_MODE }) {
   function calculateRetailPrice(commissionRate, price) {
     return Math.floor(
       (price * 100) /
@@ -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) {

package/product.js

@@ -1,4 +1,4 @@
-import { calculateProductPrice, countMinPeople } from "./price.js";
+import { calculateProductSellingPrice, countMinPeople } from "./price.js";
 
 const MATCH_HTML_REGEXP = /(<([^>]+)>)/ig;
 
@@ -12,7 +12,7 @@ export function buildIndex(id, product) {
     heroPhoto: product.heroPhoto,
     operator: product.operator.default.name,
     url: product.url,
-    price: calculateProductPrice({ adults: countMinPeople(product.pricing), children: 0, infants: 0 }, product.pricing) / countMinPeople(product.pricing),
+    price: calculateProductSellingPrice({ adults: countMinPeople(product.pricing), children: 0, infants: 0 }, product.pricing) / countMinPeople(product.pricing),
     priceType: product.pricing.type,
     availability: product.availability
   };