tripstorekrabi-shared 1.24.4 → 1.24.6

package/booking.js

@@ -2,7 +2,6 @@ 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 { FieldValue, Timestamp } from 'firebase-admin/firestore';
 import { PAY_ON_TOUR, calculateTotalOperatorPrice } from './price.js';
 import { nanoid } from 'nanoid';
 import { CHECK_IN_LATE, IN_HOUSE, isAirportDropOff, isAirportPickup, isHotelPickup, isTrainStation, KEEP_PRIVATE, NO_PICKUP_HOTEL_YET, NO_ROOM, STAY_NEARBY } from './utils.js';
@@ -28,148 +27,122 @@ export function addBookingFromInvoice(
 ) {
   let bookingNumberDoc = firestore.collection('meta').doc('BOOKING_NUMBER');
 
-  return firestore.runTransaction((transaction) => {
-    return bookingNumberDoc.get().then(async (snapshot) => {
-      let nextBookingNumber = (snapshot.get('last') ?? 0) + 1;
-      let processed = 0;
-
-      for (let i = 0; i < invoice.items.length; i++) {
-        let item = invoice.items[i];
-
-        // process only product items
-        let hasProduct = item.productId?.length > 0;
-        let productSnapshot = null;
-        let productDescription;
-        if (hasProduct) {
-          productSnapshot = await firestore
-            .collection('products')
-            .doc(item.productId)
-            .get();
-          productDescription = productSnapshot.get('shortName');
-        } else {
-          productDescription = item.description;
-        }
+  return firestore.runTransaction(async (transaction) => {
+    const snapshot = await transaction.get(bookingNumberDoc);
+    const currentLast = snapshot.get('last') ?? 0;
 
-        let notes = {};
+    const productSnapshots = {};
+    for (const item of invoice.items) {
+      if (item.productId?.length > 0 && !productSnapshots[item.productId]) {
+        const productRef = firestore.collection('products').doc(item.productId);
+        productSnapshots[item.productId] = await transaction.get(productRef);
+      }
+    }
 
-        if (comment) {
-          notes[nanoid()] = {
-            description: comment.trim(),
-            visibility: [],
-            lastModified: dayjs().toDate(),
-            lastModifiedBy: 'Trip Store Krabi Next',
-          };
-        }
+    let nextBookingNumber = currentLast + 1;
+    let processed = 0;
 
-        if (invoice.comment) {
-          notes[nanoid()] = {
-            description: invoice.comment.trim(),
-            visibility: [],
-            lastModified: dayjs().toDate(),
-            lastModifiedBy: 'Trip Store Krabi Next',
-          };
-        }
+    for (let i = 0; i < invoice.items.length; i++) {
+      let item = invoice.items[i];
+      let hasProduct = item.productId?.length > 0;
+
+      let productSnapshot = hasProduct ? productSnapshots[item.productId] : null;
+      let productDescription = hasProduct ? productSnapshot.get('shortName') : item.description;
 
-        let data = {
-          referenceNumber: 'TSK' + (nextBookingNumber + processed),
-          notes,
-          productDescription,
-          productRef: hasProduct
-            ? firestore.collection('products').doc(item.productId)
-            : null,
-          operator: productSnapshot?.get('operator.default.name') ?? '',
-          departureDate: Timestamp.fromDate(
-            dayjs(item.departureDate).toDate()
-          ),
-          schedule: item.schedule ?? '',
-          pickupTime: '?',
-          adults: item.adults ?? 0,
-          children: item.children ?? 0,
-          infants: item.infants ?? 0,
-          leadTraveller: invoice.name,
-          email: invoice.email ?? '',
-          phoneNumber: invoice.phoneNumber ?? '',
-          cc: '',
-          customerBookingStatus: 'Pending',
-          operatorBookingStatus: 'Pending',
-          sentToOperator: false,
-          startingPointDescription: item.startingPointDescription ?? "",
-          pickupHotel: item.pickupHotel ?? null,
-          roomNumber: item.roomNumber ?? '',
-          googleMapsLocation: item.googleMapsLocation ?? '',
-          dietary: item.dietary ?? "",
-          flight: item.flight ?? null,
-          train: item.train ?? null,
-          customerPaymentStatus: 'Paid',
-          operatorPaymentStatus: 'Pending',
-          extraPayments: {},
-          addOns: item.addOns ?? null,
-          labels: ['NEW'],
-          paypalInvoiceId: '',
-          paypalTransactionId: '',
-          omiseChargeId: '',
-          invoiceNumber: '',
-          date: FieldValue.serverTimestamp(),
-          createdBy: 'Trip Store Krabi Next',
+      let notes = {};
+
+      if (comment) {
+        notes[nanoid()] = {
+          description: comment.trim(),
+          visibility: [],
           lastModified: dayjs().toDate(),
           lastModifiedBy: 'Trip Store Krabi Next',
         };
+      }
 
-        if (item.startingPointId) {
-          data.startingPointId = item.startingPointId;
-        }
-
-        if (item.dropoffHotel && item.dropoffHotel.length > 0) {
-          data.dropoffHotel = item.dropoffHotel;
-        }
-
-        if (i > 0) {
-          data.partnerNetPrice = 0;
-        }
-
-        if (item.nationalParkFee) {
-          data.nationalParkFee = item.nationalParkFee;
-        }
-
-        if (item.tourGuideLanguage) {
-          data.tourGuideLanguage = item.tourGuideLanguage;
-        }
+      if (invoice.comment) {
+        notes[nanoid()] = {
+          description: invoice.comment.trim(),
+          visibility: [],
+          lastModified: dayjs().toDate(),
+          lastModifiedBy: 'Trip Store Krabi Next',
+        };
+      }
 
-        let endPointId = item.endPointId;
-        if (!endPointId) {
-          let endPoints = productSnapshot?.get('endPoints');
-          if (endPoints && endPoints.length === 1) {
-            endPointId = endPoints[0].id;
-          }
-        }
-        if (endPointId) {
-          data.endPointId = endPointId;
+      let data = {
+        date: dayjs().toDate(),
+        departureDate: dayjs(item.departureDate).toDate(),
+        referenceNumber: 'TSK' + (nextBookingNumber + processed),
+        notes,
+        productDescription,
+        productRef: hasProduct ? firestore.collection('products').doc(item.productId) : null,
+        operator: productSnapshot?.get('operator.default.name') ?? '',
+        schedule: item.schedule ?? '',
+        pickupTime: '?',
+        adults: item.adults ?? 0,
+        children: item.children ?? 0,
+        infants: item.infants ?? 0,
+        leadTraveller: invoice.name,
+        email: invoice.email ?? '',
+        phoneNumber: invoice.phoneNumber ?? '',
+        cc: '',
+        customerBookingStatus: 'Pending',
+        operatorBookingStatus: 'Pending',
+        sentToOperator: false,
+        startingPointDescription: item.startingPointDescription ?? "",
+        pickupHotel: item.pickupHotel ?? null,
+        roomNumber: item.roomNumber ?? '',
+        googleMapsLocation: item.googleMapsLocation ?? '',
+        dietary: item.dietary ?? "",
+        flight: item.flight ?? null,
+        train: item.train ?? null,
+        customerPaymentStatus: 'Paid',
+        operatorPaymentStatus: 'Pending',
+        extraPayments: {},
+        addOns: item.addOns ?? null,
+        labels: ['NEW'],
+        paypalInvoiceId: '',
+        paypalTransactionId: '',
+        omiseChargeId: '',
+        invoiceNumber: '',
+        createdBy: 'Trip Store Krabi Next',
+        lastModified: dayjs().toDate(),
+        lastModifiedBy: 'Trip Store Krabi Next',
+      };
+
+      if (item.startingPointId) data.startingPointId = item.startingPointId;
+      if (item.dropoffHotel && item.dropoffHotel.length > 0) data.dropoffHotel = item.dropoffHotel;
+      if (i > 0) data.partnerNetPrice = 0;
+      if (item.nationalParkFee) data.nationalParkFee = item.nationalParkFee;
+      if (item.tourGuideLanguage) data.tourGuideLanguage = item.tourGuideLanguage;
+
+      let endPointId = item.endPointId;
+      if (!endPointId) {
+        let endPoints = productSnapshot?.get('endPoints');
+        if (endPoints && endPoints.length === 1) {
+          endPointId = endPoints[0].id;
         }
+      }
+      if (endPointId) data.endPointId = endPointId;
 
-        if (productSnapshot) {
-          data.operatorNetPrice = calculateTotalOperatorPrice(
-            data,
-            productSnapshot.data()
-          );
-        } else {
-          data.operatorNetPrice = 0;
-        }
+      if (productSnapshot) {
+        data.operatorNetPrice = calculateTotalOperatorPrice(data, productSnapshot.data());
+      } else {
+        data.operatorNetPrice = 0;
+      }
 
-        data = { ...data, ...paymentData };
+      data = { ...data, ...paymentData };
 
-        let doc = firestore.collection('bookings').doc();
-        transaction.set(doc, data);
-        processed++;
-      }
+      let doc = firestore.collection('bookings').doc();
+      transaction.set(doc, data);
+      processed++;
+    }
 
-      transaction.set(
-        bookingNumberDoc,
-        {
-          last: FieldValue.increment(processed),
-        },
-        { merge: true }
-      );
-    });
+    transaction.set(
+      bookingNumberDoc,
+      { last: currentLast + processed },
+      { merge: true }
+    );
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.24.4",
+  "version": "1.24.6",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "dayjs": "^1.11.21",
-    "libphonenumber-js": "^1.13.6",
-    "nanoid": "^5.1.11",
-    "firebase-admin": "^14.0.0"
+    "libphonenumber-js": "^1.13.7",
+    "nanoid": "^5.1.16",
+    "firebase-admin": "^14.1.0"
   },
   "scripts": {
     "deploy": "npm publish"

package/price.js

@@ -15,67 +15,102 @@ export const PAX_EXTRA_PAYMENT = 'PAX';
 export const ADD_ON_EXTRA_PAYMENT = 'ADD-ON';
 export const PRODUCT_CHANGE_EXTRA_PAYMENT = 'PRODUCT CHANGE';
 export const OTHER_EXTRA_PAYMENT = 'OTHER';
-export const EXTRA_PAYMENT_CATEGORIES = [STARTING_POINT_EXTRA_PAYMENT,
+export const EXTRA_PAYMENT_CATEGORIES = [
+  STARTING_POINT_EXTRA_PAYMENT,
   END_POINT_EXTRA_PAYMENT,
   NATIONAL_PARK_FEE_EXTRA_PAYMENT,
   PAX_EXTRA_PAYMENT,
   ADD_ON_EXTRA_PAYMENT,
   PRODUCT_CHANGE_EXTRA_PAYMENT,
-  OTHER_EXTRA_PAYMENT];
+  OTHER_EXTRA_PAYMENT
+];
 
 const SELLING_MODE = 0;
 const PARTNER_MODE = 1;
 const OPERATOR_MODE = 2;
 
-export function getActiveRevision(date, pricing) {
-  if (!pricing?.revisions || pricing.revisions.length === 0) return null;
+function parseSafeDate(dateField) {
+  if (!dateField) return null;
+  if (typeof dateField.toDate === 'function') return dayjs(dateField.toDate());
+  if (dateField instanceof Date) return dayjs(dateField);
+  const parsed = dayjs(dateField);
+  return parsed.isValid() ? parsed : null;
+}
 
-  const getSafeDate = (dateField) => {
-    if (!dateField) return null;
-    if (typeof dateField.toDate === 'function') return dayjs(dateField.toDate());
-    return dayjs(dateField);
-  };
+export function resolvePricingContext(pricing, bookingDate = dayjs(), departureDate = null) {
+  if (!pricing) return null;
 
-  const getSortedActive = () => [...pricing.revisions]
-    .filter(r => r.isActive !== false)
-    .sort((a, b) => getSafeDate(a.startDate)?.valueOf() - getSafeDate(b.startDate)?.valueOf());
+  const safeBookingDate = parseSafeDate(bookingDate)?.startOf('day') || dayjs().startOf('day');
+  let activeRevision = pricing;
 
-  const bookingDate = getSafeDate(date)?.startOf('day');
+  if (pricing.revisions?.length > 0) {
+    const validRevisions = pricing.revisions
+      .filter(r => r.isActive !== false)
+      .map(r => ({ ...r, parsedDate: parseSafeDate(r.startDate)?.startOf('day') }))
+      .filter(r => r.parsedDate && (r.parsedDate.isSame(safeBookingDate) || r.parsedDate.isBefore(safeBookingDate)))
+      .sort((a, b) => b.parsedDate.valueOf() - a.parsedDate.valueOf());
 
-  if (!bookingDate || !bookingDate.isValid()) {
-    return getSortedActive()[0] || pricing.revisions[0];
+    if (validRevisions.length > 0) {
+      activeRevision = { ...pricing, ...validRevisions[0] };
+    } else {
+      const sortedAll = [...pricing.revisions]
+        .filter(r => r.isActive !== false)
+        .sort((a, b) => (parseSafeDate(a.startDate)?.valueOf() || 0) - (parseSafeDate(b.startDate)?.valueOf() || 0));
+      activeRevision = { ...pricing, ...(sortedAll[0] || pricing.revisions[0]) };
+    }
   }
 
-  const candidateRevisions = pricing.revisions.filter((rev) => {
-    if (rev.isActive === false) return false;
-    const revStart = getSafeDate(rev.startDate)?.startOf('day');
-    if (!revStart || !revStart.isValid()) return false;
+  let activeVolumes = activeRevision.volumes || [];
 
-    return revStart.isSame(bookingDate) || revStart.isBefore(bookingDate);
-  });
+  if (activeRevision.promotion && departureDate) {
+    const depDate = parseSafeDate(departureDate);
+    const promoStart = parseSafeDate(activeRevision.promotion.startDate);
+    const promoEnd = parseSafeDate(activeRevision.promotion.endDate);
 
-  if (candidateRevisions.length === 0) {
-    return getSortedActive()[0] || pricing.revisions[0];
+    if (depDate?.isValid() && promoStart?.isValid() && promoEnd?.isValid() &&
+      depDate.isBetween(promoStart, promoEnd, "day", "[]")) {
+      activeVolumes = activeRevision.promotion.volumes || activeVolumes;
+    }
   }
 
-  return candidateRevisions.sort((a, b) => {
-    const aTime = getSafeDate(a.startDate)?.valueOf() || 0;
-    const bTime = getSafeDate(b.startDate)?.valueOf() || 0;
-    return bTime - aTime;
-  })[0];
+  return {
+    ...activeRevision,
+    volumes: activeVolumes,
+    _isResolved: true
+  };
+}
+
+export function getActiveRevision(date, pricing) {
+  return resolvePricingContext(pricing, date, null);
 }
 
 export function getActivePricing(date, pricing) {
-  const activeRevision = getActiveRevision(date, pricing);
+  return resolvePricingContext(pricing, date, null);
+}
 
-  if (!activeRevision) {
-    return pricing;
-  }
+export function findVolume(people, context) {
+  const total = (people?.adults ?? 0) + (people?.children ?? 0);
 
-  return {
-    ...pricing,
-    ...activeRevision
-  };
+  const activeContext = context?._isResolved ? context : resolvePricingContext(context, people?.date, people?.departureDate);
+  const volumes = activeContext?.volumes;
+
+  if (!volumes || volumes.length === 0) return undefined;
+
+  const sortedVolumes = [...volumes].sort((v1, v2) => v1.max - v2.max);
+
+  return sortedVolumes.find(v => total <= v.max) || sortedVolumes[sortedVolumes.length - 1];
+}
+
+export function countMinPeople(pricing, bookingDate = dayjs(), departureDate = null) {
+  const context = resolvePricingContext(pricing, bookingDate, departureDate);
+  const minVals = context?.volumes?.map(v => v.min ?? 1) || [];
+  return minVals.length > 0 ? Math.max(Math.min(...minVals), 1) : 1;
+}
+
+export function countMaxPeople(pricing, bookingDate = dayjs(), departureDate = null) {
+  const context = resolvePricingContext(pricing, bookingDate, departureDate);
+  const maxVals = context?.volumes?.map(v => v.max ?? MAX_PAX) || [];
+  return maxVals.length > 0 ? Math.max(...maxVals) : MAX_PAX;
 }
 
 export function calculateProductSellingPrice(booking, pricing) {
@@ -91,26 +126,16 @@ export function calculateProductOperatorPrice(booking, pricing) {
 }
 
 function calculateSellingPrice(commissionRate = 0, price) {
-  return Math.floor(
-    (price * 100) /
-    (100 -
-      commissionRate)
-  );
+  return Math.floor((price * 100) / (100 - commissionRate));
 }
 
 export function calculateInflatedSellingPrice(price, config, forceInflation = false) {
-  if (!config || (!config.inflatedPrices && !forceInflation)) {
-    return price;
-  }
+  if (!config || (!config.inflatedPrices && !forceInflation)) return price;
 
   const discountRate = Number(config.discount) || 0;
-
-  if (discountRate === 0 || !isFinite(discountRate)) {
-    return price;
-  }
+  if (discountRate === 0 || !isFinite(discountRate)) return price;
 
   const denominator = 100 - discountRate;
-
   if (denominator <= 0) {
     console.warn("Invalid discount rate for inflation calculation:", discountRate);
     return price;
@@ -121,163 +146,82 @@ export function calculateInflatedSellingPrice(price, config, forceInflation = fa
 }
 
 function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE }) {
-  const activeRevision = getActiveRevision(booking.date, pricing) || pricing;
-
-  if (!activeRevision) {
-    throw new Error(`Pricing fail-safe triggered: No active or standard pricing found for booking date ${booking.date}.`);
-  }
-
-  let activeVolumes = activeRevision.volumes || [];
+  const context = resolvePricingContext(pricing, booking.date, booking.departureDate);
 
-  if (activeRevision.promotion) {
-    const departureDate = booking.departureDate instanceof Date ? dayjs(booking.departureDate) : typeof booking.departureDate?.toDate === 'function' ? dayjs(booking.departureDate.toDate()) : null;
-    const startDate = activeRevision.promotion.startDate instanceof Date ? activeRevision.promotion.startDate : typeof activeRevision.promotion.startDate.toDate === 'function' ? activeRevision.promotion.startDate.toDate() : null;
-    const endDate = activeRevision.promotion.endDate instanceof Date ? activeRevision.promotion.endDate : typeof activeRevision.promotion.endDate.toDate === 'function' ? activeRevision.promotion.endDate.toDate() : null;
-
-    if (departureDate?.isValid() && departureDate?.isBetween(dayjs(startDate), dayjs(endDate), "day", "[]")) {
-      activeVolumes = activeRevision.promotion.volumes || [];
-    }
+  if (!context || !context.volumes || context.volumes.length === 0) {
+    console.warn("Pricing fail-safe triggered: No valid context or volumes found.");
+    return 0;
   }
 
-  if (activeVolumes.length === 0) {
-    console.warn("Pricing fail-safe triggered: Active revision has no volumes.");
+  const volume = findVolume(booking, context);
+  if (!volume) {
+    console.error(`No volume price found for ${booking.adults + booking.children} people`);
     return 0;
   }
 
-  const context = {
-    ...pricing,
-    volumes: activeVolumes
-  };
-
   let total = 0;
-  const type = context.type;
-
-  switch (type) {
-    case "person": {
-      const volume = findVolume(booking, context);
-      if (!volume) {
-        console.error(`No volume price found for the total amount of ${booking.adults + booking.children} people`);
-        return 0;
-      } else {
-        const bookingSourceKey = getBookingSourceKey(booking.otaPartnerRef);
-
-        if (volume[bookingSourceKey]) {
-          const customPricing = volume[bookingSourceKey];
-
-          if (options.mode === SELLING_MODE) {
-            const commissionRate = context.commissionRates?.[bookingSourceKey];
-            const baseNetPriceAdult = customPricing.adult.partnerNetPrice;
-            const baseRetailPriceAdult = calculateSellingPrice(commissionRate, baseNetPriceAdult);
-            const finalPriceAdult = calculateInflatedSellingPrice(baseRetailPriceAdult, customPricing);
-
-            let finalPriceChild = 0;
-            if (context.ageBands.child.active && volume.child && booking.children) {
-              const baseNetPriceChild = customPricing.child.partnerNetPrice;
-              const baseRetailPriceChild = calculateSellingPrice(commissionRate, baseNetPriceChild);
-              finalPriceChild = calculateInflatedSellingPrice(baseRetailPriceChild, customPricing);
-            }
-
-            total = booking.adults * finalPriceAdult + (booking.children ? booking.children * finalPriceChild : 0);
-          } else if (options.mode === PARTNER_MODE) {
-            total = booking.adults * customPricing.adult.partnerNetPrice + (context.ageBands.child.active && volume.child && booking.children ? booking.children * customPricing.child.partnerNetPrice : 0);
-          } else if (options.mode === OPERATOR_MODE) {
-            total = booking.adults * (customPricing.adult.operatorNetPrice ?? volume.adult.operatorNetPrice) + (context.ageBands.child.active && volume.child && booking.children ? (booking.children * (customPricing.child.operatorNetPrice ?? volume.child.operatorNetPrice)) : 0);
-          }
-        } else {
-          if (options.mode === SELLING_MODE || options.mode === PARTNER_MODE) {
-            total = booking.adults * volume.adult.sellingPrice + (context.ageBands.child.active && volume.child && booking.children ? booking.children * volume.child.sellingPrice : 0);
-          } else if (options.mode === OPERATOR_MODE) {
-            total = booking.adults * volume.adult.operatorNetPrice + (context.ageBands.child.active && volume.child && booking.children ? booking.children * volume.child.operatorNetPrice : 0);
-          }
+  const bookingSourceKey = getBookingSourceKey(booking.otaPartnerRef);
+
+  if (context.type === "person") {
+    if (volume[bookingSourceKey]) {
+      const customPricing = volume[bookingSourceKey];
+
+      if (options.mode === SELLING_MODE) {
+        const commRate = context.commissionRates?.[bookingSourceKey] || 0;
+        const finalPriceAdult = calculateInflatedSellingPrice(calculateSellingPrice(commRate, customPricing.adult.partnerNetPrice), customPricing);
+
+        let finalPriceChild = 0;
+        if (context.ageBands?.child?.active && volume.child && booking.children) {
+          finalPriceChild = calculateInflatedSellingPrice(calculateSellingPrice(commRate, customPricing.child.partnerNetPrice), customPricing);
         }
-        break;
+        total = (booking.adults * finalPriceAdult) + (booking.children ? booking.children * finalPriceChild : 0);
+      } else if (options.mode === PARTNER_MODE) {
+        total = (booking.adults * customPricing.adult.partnerNetPrice) + (context.ageBands?.child?.active && volume.child && booking.children ? booking.children * customPricing.child.partnerNetPrice : 0);
+      } else if (options.mode === OPERATOR_MODE) {
+        total = (booking.adults * (customPricing.adult.operatorNetPrice ?? volume.adult.operatorNetPrice)) + (context.ageBands?.child?.active && volume.child && booking.children ? booking.children * (customPricing.child.operatorNetPrice ?? volume.child.operatorNetPrice) : 0);
+      }
+    } else {
+      if (options.mode === SELLING_MODE || options.mode === PARTNER_MODE) {
+        total = (booking.adults * volume.adult.sellingPrice) + (context.ageBands?.child?.active && volume.child && booking.children ? booking.children * volume.child.sellingPrice : 0);
+      } else if (options.mode === OPERATOR_MODE) {
+        total = (booking.adults * volume.adult.operatorNetPrice) + (context.ageBands?.child?.active && volume.child && booking.children ? booking.children * volume.child.operatorNetPrice : 0);
       }
     }
-    case "group": {
-      const volume = findVolume(booking, context);
-      if (!volume) {
-        console.error(`No volume price found for the total amount of ${booking.adults + booking.children} people`);
-        return 0;
-      } else {
-        const bookingSourceKey = getBookingSourceKey(booking.otaPartnerRef);
-
-        if (volume[bookingSourceKey]) {
-          const customPricing = volume[bookingSourceKey];
-
-          if (options.mode === SELLING_MODE) {
-            const commissionRate = context.commissionRates?.[bookingSourceKey];
-            const baseNetPrice = customPricing.partnerNetPrice;
-            const baseRetailPrice = calculateSellingPrice(commissionRate, baseNetPrice);
-            const finalPrice = calculateInflatedSellingPrice(baseRetailPrice, customPricing);
-            total = finalPrice;
-          } else if (options.mode === PARTNER_MODE) {
-            total = customPricing.partnerNetPrice
-          } else if (options.mode === OPERATOR_MODE) {
-            total = customPricing.operatorNetPrice ?? volume.operatorNetPrice;
-          }
-        } else {
-          if (options.mode === SELLING_MODE || options.mode === PARTNER_MODE) {
-            total = volume.sellingPrice;
-          } else if (options.mode === OPERATOR_MODE) {
-            total = volume.operatorNetPrice;
-          }
-        }
-
-        break;
+  } else if (context.type === "group") {
+    if (volume[bookingSourceKey]) {
+      const customPricing = volume[bookingSourceKey];
+
+      if (options.mode === SELLING_MODE) {
+        const commRate = context.commissionRates?.[bookingSourceKey] || 0;
+        total = calculateInflatedSellingPrice(calculateSellingPrice(commRate, customPricing.partnerNetPrice), customPricing);
+      } else if (options.mode === PARTNER_MODE) {
+        total = customPricing.partnerNetPrice;
+      } else if (options.mode === OPERATOR_MODE) {
+        total = customPricing.operatorNetPrice ?? volume.operatorNetPrice;
+      }
+    } else {
+      if (options.mode === SELLING_MODE || options.mode === PARTNER_MODE) {
+        total = volume.sellingPrice;
+      } else if (options.mode === OPERATOR_MODE) {
+        total = volume.operatorNetPrice;
       }
     }
-    default:
-      throw new Error(`Pricing type ${type} is not supported`);
+  } else {
+    throw new Error(`Pricing type ${context.type} is not supported`);
   }
 
   return total;
 }
 
-export function findVolume(people, context) {
-  let total = (people.adults ?? 0) + (people.children ?? 0);
-
-  if (!context?.volumes || context.volumes.length === 0) return undefined;
-
-  const sortedVolumes = [...context.volumes].sort((v1, v2) => v1.max - v2.max);
-
-  return sortedVolumes.find((item, i) => {
-    if (total <= item.max) {
-      return true;
-    }
-    else if (i === sortedVolumes.length - 1) {
-      return true;
-    }
-    return false;
-  });
-}
-
-export function countMinPeople(pricing) {
-  const volumes = pricing?.volumes?.map((item) => item.min) || [];
-  if (volumes.length === 0) return 1;
-  return Math.max(Math.min(...volumes), 1);
-}
-
-export function countMaxPeople(pricing) {
-  const volumes = pricing?.volumes?.map((item) => item.max) || [];
-  if (volumes.length === 0) return MAX_PAX;
-  return Math.max(...volumes);
-}
-
 export function getTotalAmountToBeReceived(booking, options = {}) {
   let filter = (item) => (!options.filter || options.filter(item)) && !item.disabled && item.paymentMethod !== PAY_ON_TOUR;
   return booking.customerPaymentStatus === "Refunded" ? 0 : booking.partnerNetPrice + calculateExtraPayments(booking, { ...options, mode: SELLING_MODE, filter })
 }
 
 export function calculatePartnerNetPrice(booking, product) {
-  return getExtraPaymentsPaidWithPartner(
-    booking,
-    product
-  ).reduce(
+  return getExtraPaymentsPaidWithPartner(booking, product).reduce(
     (prev, curr) => (prev ?? 0) + curr.price,
-    calculateProductPartnerNetPrice(
-      booking,
-      product.pricing
-    )
+    calculateProductPartnerNetPrice(booking, product.pricing)
   );
 }
 
@@ -301,24 +245,15 @@ function calculateTotalPrice(booking, product, options = { mode: SELLING_MODE })
   total += calculateExtraPayments(booking, {
     ...options,
     filter: (item) => {
-      if (item.disabled === true) {
-        return false;
-      } else if (item.paymentMethod === PAY_ON_TOUR) {
-        return true;
-      } else if (item.paymentMethod === PAY_BEFORE && item.category === OTHER_EXTRA_PAYMENT) {
-        return true;
-      }
+      if (item.disabled === true) return false;
+      if (item.paymentMethod === PAY_ON_TOUR) return true;
+      if (item.paymentMethod === PAY_BEFORE && item.category === OTHER_EXTRA_PAYMENT) return true;
     },
     getPrice: (item, options) => {
       if (item.paymentMethod === PAY_ON_TOUR) {
-        if (item.category !== OTHER_EXTRA_PAYMENT) {
-          return -getExtraPaymentPrice(item, options);
-        } else {
-          return 0;
-        }
-      } else {
-        return getExtraPaymentPrice(item, options);
+        return item.category !== OTHER_EXTRA_PAYMENT ? -getExtraPaymentPrice(item, options) : 0;
       }
+      return getExtraPaymentPrice(item, options);
     }
   });
   total += calculateAddOnsPrice(booking, product, options);
@@ -326,7 +261,9 @@ function calculateTotalPrice(booking, product, options = { mode: SELLING_MODE })
 }
 
 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;
+  return booking.nationalParkFee === ALREADY_PAID && product.nationalPark
+    ? (product.nationalPark.pricing.adult * booking.adults) + (product.nationalPark.pricing.child * booking.children)
+    : 0;
 }
 
 function getExtraPaymentPrice(item, options) {
@@ -350,19 +287,15 @@ export function calculateTotalExtraPaymentsOperatorPrice(booking) {
 function calculateExtraPayments(booking, options = { mode: SELLING_MODE }) {
   let filter = options.filter ?? ((item) => !item.disabled);
   let getPrice = options.getPrice ?? getExtraPaymentPrice;
-
   let total = 0;
-  for (const item of Object.values(booking.extraPayments).filter(filter)) {
-    total += getPrice(item, options);
 
+  for (const item of Object.values(booking.extraPayments ?? {}).filter(filter)) {
+    total += getPrice(item, options);
     if (item.paymentMethod === PAY_ON_TOUR && options.mode === OPERATOR_MODE) {
       let ourCommission = item.price - item.operatorPrice;
-      if (ourCommission > 0) {
-        total -= ourCommission;
-      }
+      if (ourCommission > 0) total -= ourCommission;
     }
   }
-
   return total;
 }
 
@@ -370,56 +303,32 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
   let startingPoint = findStartingPoint(product, booking.startingPointId);
   let endPoint = findEndPoint(product, booking.endPointId);
   let addOnDefs = {};
+
   (product.addOns ?? []).forEach((addOn) => {
     addOnDefs[addOn.id] = addOn;
   });
+
   let addOns = Object.entries(booking.addOns ?? {}).filter(([id]) => addOnDefs[id] != null).map(([id, addOn]) => {
     let addOnDef = addOnDefs[id];
-
     return {
       category: ADD_ON_EXTRA_PAYMENT,
       description: addOnDef.title,
-      price: addOn.adults * addOnDef.pricing.adult.sellingPrice +
-        (addOn.children ?? 0) * (addOnDef.pricing.child?.sellingPrice ?? 0),
-      operatorPrice: addOn.adults * addOnDef.pricing.adult.operatorNetPrice +
-        (addOn.children ?? 0) * (addOnDef.pricing.child?.operatorNetPrice ?? 0)
+      price: (addOn.adults * addOnDef.pricing.adult.sellingPrice) + ((addOn.children ?? 0) * (addOnDef.pricing.child?.sellingPrice ?? 0)),
+      operatorPrice: (addOn.adults * addOnDef.pricing.adult.operatorNetPrice) + ((addOn.children ?? 0) * (addOnDef.pricing.child?.operatorNetPrice ?? 0))
     }
   });
 
   return [
-    {
-      category: STARTING_POINT_EXTRA_PAYMENT,
-      description: startingPoint.name,
-      price: calculateStartEndPointSellingPrice(booking, startingPoint),
-      operatorPrice: calculateStartEndPointOperatorPrice(booking, startingPoint),
-    },
-    {
-      category: END_POINT_EXTRA_PAYMENT,
-      description: endPoint.name,
-      price: calculateStartEndPointSellingPrice(booking, endPoint),
-      operatorPrice: calculateStartEndPointOperatorPrice(booking, endPoint),
-    },
-    {
-      category: NATIONAL_PARK_FEE_EXTRA_PAYMENT,
-      description: `Entrance fee to ${product.nationalPark?.title}`,
-      price: calculateNationalParkFee(booking, product),
-      operatorPrice: calculateNationalParkFee(booking, product),
-    },
+    { category: STARTING_POINT_EXTRA_PAYMENT, description: startingPoint.name, price: calculateStartEndPointSellingPrice(booking, startingPoint), operatorPrice: calculateStartEndPointOperatorPrice(booking, startingPoint) },
+    { category: END_POINT_EXTRA_PAYMENT, description: endPoint.name, price: calculateStartEndPointSellingPrice(booking, endPoint), operatorPrice: calculateStartEndPointOperatorPrice(booking, endPoint) },
+    { category: NATIONAL_PARK_FEE_EXTRA_PAYMENT, description: `Entrance fee to ${product.nationalPark?.title}`, price: calculateNationalParkFee(booking, product), operatorPrice: calculateNationalParkFee(booking, product) },
     ...addOns
   ].filter(
-    (item) =>
-      (item.price > 0 || item.operatorPrice > 0) &&
-      Object.values(booking.extraPayments).find(
-        (extraPayment) =>
-          extraPayment.category === item.category && !extraPayment.disabled
-      ) == null
+    (item) => (item.price > 0 || item.operatorPrice > 0) &&
+      !Object.values(booking.extraPayments ?? {}).find(ep => ep.category === item.category && !ep.disabled)
   ).map((item) => {
-    if (booking.customerPaymentStatus === "Refunded") {
-      item.price = 0;
-    }
-    if (booking.operatorPaymentStatus === "No Charge") {
-      item.operatorPrice = 0;
-    }
+    if (booking.customerPaymentStatus === "Refunded") item.price = 0;
+    if (booking.operatorPaymentStatus === "No Charge") item.operatorPrice = 0;
     return item;
   });
 }
@@ -427,31 +336,18 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
 export function getActiveExtraPayments(extraPayments) {
   return [...extraPayments]
     .filter(([id, item]) => !item.disabled)
-    .sort(([id1, item1], [id2, item2]) =>
-      item1.description.localeCompare(item2.description)
-    );
+    .sort(([id1, item1], [id2, item2]) => item1.description.localeCompare(item2.description));
 }
 
 export function getExtraPaymentsOperatorPrice(extraPayments) {
-  return getActiveExtraPayments(extraPayments).reduce(
-    (prev, curr) => {
-      let price;
-      let item = curr[1];
-      if (item.paymentMethod === PAY_ON_TOUR) {
-        let ourCommission = item.price - item.operatorPrice;
-        if (ourCommission > 0) {
-          price = -ourCommission;
-        } else {
-          price = 0;
-        }
-      } else {
-        price = item.operatorPrice;
-      }
-
-      return prev + price;
-    },
-    0
-  );
+  return getActiveExtraPayments(extraPayments).reduce((prev, curr) => {
+    let item = curr[1];
+    if (item.paymentMethod === PAY_ON_TOUR) {
+      let ourCommission = item.price - item.operatorPrice;
+      return prev + (ourCommission > 0 ? -ourCommission : 0);
+    }
+    return prev + item.operatorPrice;
+  }, 0);
 }
 
 export function calculateAddOnsPrice(booking, product, options = { mode: SELLING_MODE }) {
@@ -461,11 +357,8 @@ export function calculateAddOnsPrice(booking, product, options = { mode: SELLING
   for (const [id, addOn] of Object.entries(booking.addOns ?? {})) {
     let addOnDef = findAddOn(id, product.addOns ?? []);
     if (addOnDef) {
-      total += addOn.adults * (isSelling ? addOnDef.pricing.adult
-        .sellingPrice : addOnDef.pricing.adult
-        .operatorNetPrice) + (addOn.children > 0 ? addOn.children * (isSelling ? addOnDef.pricing.child
-          .sellingPrice : addOnDef.pricing.child
-          .operatorNetPrice) : 0);
+      total += (addOn.adults * (isSelling ? addOnDef.pricing.adult.sellingPrice : addOnDef.pricing.adult.operatorNetPrice)) +
+        (addOn.children > 0 ? addOn.children * (isSelling ? addOnDef.pricing.child.sellingPrice : addOnDef.pricing.child.operatorNetPrice) : 0);
     }
   }
   return total;
@@ -486,32 +379,23 @@ export function calculateStartEndPointPartnerNetPrice(people, startEndPoint) {
 function calculateStartEndPointPrice(people, startEndPoint, options = { mode: SELLING_MODE }) {
   let pricing = startEndPoint?.pricing;
   let isSelling = [SELLING_MODE, PARTNER_MODE].includes(options.mode);
+
   if (pricing) {
+    const priceAmount = isSelling ? (pricing.sellingPrice ?? pricing.amount) : pricing.operatorNetPrice;
     if (pricing.type === "group") {
-      return (isSelling ? (pricing.sellingPrice ?? pricing.amount) : pricing.operatorNetPrice) * Math.ceil((people.adults + people.children) / pricing.max);
+      return priceAmount * Math.ceil((people.adults + people.children) / pricing.max);
     } else if (pricing.type === "person") {
-      return (isSelling ? (pricing.sellingPrice ?? pricing.amount) : pricing.operatorNetPrice) * (people.adults + people.children);
-    } else {
-      return 0;
+      return priceAmount * (people.adults + people.children);
     }
-  } else {
-    return 0;
   }
+  return 0;
 }
 
 export function findStartingPoint(product, startingPointId, useDefault = true) {
   return [
     ...product.startingPoints,
-    {
-      id: TELL_HOTEL_LATER_STARTING_POINT.id,
-      name: TELL_HOTEL_LATER_STARTING_POINT.description,
-      value: '',
-    },
-    {
-      id: CUSTOM_MEETING_POINT.id,
-      name: CUSTOM_MEETING_POINT.description,
-      value: '',
-    },
+    { id: TELL_HOTEL_LATER_STARTING_POINT.id, name: TELL_HOTEL_LATER_STARTING_POINT.description, value: '' },
+    { id: CUSTOM_MEETING_POINT.id, name: CUSTOM_MEETING_POINT.description, value: '' },
   ].find((item) => item.id === startingPointId) ?? (useDefault ? product.startingPoints[0] : null);
 }
 
@@ -520,9 +404,7 @@ export function findEndPoint(product, endPointId, useDefault = true) {
 }
 
 export function findAddOn(id, addOns) {
-  return addOns.find((item) =>
-    item.id === id
-  );
+  return addOns.find((item) => item.id === id);
 }
 
 export function inRange(expected, actual, boundary = 10) {