tripstorekrabi-shared 1.21.3 → 1.21.5

package/package.json

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

package/price.js

@@ -1,4 +1,4 @@
-import { CUSTOM_MEETING_POINT, TELL_HOTEL_LATER_STARTING_POINT, getBookingType } from "./utils.js";
+import { CUSTOM_MEETING_POINT, TELL_HOTEL_LATER_STARTING_POINT, getBookingSourceKey } from "./utils.js";
 import dayjs from 'dayjs';
 import isBetween from 'dayjs/plugin/isBetween.js';
 
@@ -68,13 +68,13 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
         console.error(`No volume price found for the total amount of ${booking.adults + booking.children} people`);
         return undefined;
       } else {
-        let bookingType = getBookingType(booking.referenceNumber);
+        let bookingSourceKey = getBookingSourceKey(booking.referenceNumber);
 
-        if (volume[bookingType]) {
-          let customPricing = volume[bookingType];
+        if (volume[bookingSourceKey]) {
+          let customPricing = volume[bookingSourceKey];
 
           if (options.mode === SELLING_MODE) {
-            let commissionRate = pricing.commissionRates?.[bookingType];
+            let commissionRate = pricing.commissionRates?.[bookingSourceKey];
 
             if (commissionRate && commissionRate > 0) {
               total = booking.adults * calculateSellingPrice(commissionRate, customPricing.adult.partnerNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? (booking.children * calculateSellingPrice(commissionRate, customPricing.child.partnerNetPrice)) : 0);
@@ -102,13 +102,13 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
         console.error(`No volume price found for the total amount of ${booking.adults + booking.children} people`);
         return undefined;
       } else {
-        let bookingType = getBookingType(booking.referenceNumber);
+        let bookingSourceKey = getBookingSourceKey(booking.otaPartnerRef);
 
-        if (volume[bookingType]) {
-          let customPricing = volume[bookingType];
+        if (volume[bookingSourceKey]) {
+          let customPricing = volume[bookingSourceKey];
 
           if (options.mode === SELLING_MODE) {
-            let commissionRate = pricing.commissionRates?.[bookingType];
+            let commissionRate = pricing.commissionRates?.[bookingSourceKey];
 
             if (commissionRate && commissionRate > 0) {
               total = calculateSellingPrice(commissionRate, customPricing.partnerNetPrice);
@@ -139,7 +139,7 @@ function calculateProductPrice(booking, pricing, options = { mode: SELLING_MODE
 }
 
 export function findVolume(people, pricing) {
-  let total = people.adults + people.children ?? 0;
+  let total = (people.adults ?? 0) + (people.children ?? 0);
   return [...pricing.volumes].sort((v1, v2) => v1.max - v2.max).find((item, i) => {
     if (total <= item.max) {
       return true;

package/utils.js

@@ -695,61 +695,59 @@ export function createVoucherRequest(booking, product) {
 }
 
 export function isGYGBooking(otaPartnerRef) {
-  return otaPartnerRef.id === GYG_AGENCY_ID;
+  return otaPartnerRef?.id === GYG_AGENCY_ID;
 }
 
 export function isViatorBooking(otaPartnerRef) {
-  return otaPartnerRef.id === VIATOR_AGENCY_ID;
+  return otaPartnerRef?.id === VIATOR_AGENCY_ID;
 }
 
 export function isExpediaBooking(otaPartnerRef) {
-  return otaPartnerRef.id === EXP_AGENCY_ID;
+  return otaPartnerRef?.id === EXP_AGENCY_ID;
 }
 
 export function isKlookBooking(otaPartnerRef) {
-  return otaPartnerRef.id === KLK_AGENCY_ID;
+  return otaPartnerRef?.id === KLK_AGENCY_ID;
 }
 
 export function isMusementBooking(otaPartnerRef) {
-  return otaPartnerRef.id === MUS_AGENCY_ID;
+  return otaPartnerRef?.id === MUS_AGENCY_ID;
 }
 
 export function isTiqetsBooking(otaPartnerRef) {
-  return otaPartnerRef.id === TIQ_AGENCY_ID;
+  return otaPartnerRef?.id === TIQ_AGENCY_ID;
 }
 
 export function isCivitatisBooking(otaPartnerRef) {
-  return otaPartnerRef.id === CIV_AGENCY_ID;
+  return otaPartnerRef?.id === CIV_AGENCY_ID;
 }
 
 export function isCuriosidad(otaPartnerRef) {
-  return otaPartnerRef.id === CUR_AGENCY_ID
+  return otaPartnerRef?.id === CUR_AGENCY_ID
 }
 
 export function isTSKBooking(otaPartnerRef) {
   return !otaPartnerRef || otaPartnerRef.id === TRIPSTORE_AGENCY_ID;
 }
 
-export function getBookingType(referenceNumber) {
-  if (!referenceNumber) {
-    return '';
-  }
-
-  if (isGYGBooking(referenceNumber)) {
+export function getBookingSourceKey(otaPartnerRef) {
+  if (isGYGBooking(otaPartnerRef)) {
     return 'gyg';
-  } else if (isViatorBooking(referenceNumber)) {
+  } else if (isViatorBooking(otaPartnerRef)) {
     return 'br';
-  } else if (isExpediaBooking(referenceNumber)) {
+  } else if (isExpediaBooking(otaPartnerRef)) {
     return 'exp';
-  } else if (isKlookBooking(referenceNumber)) {
+  } else if (isKlookBooking(otaPartnerRef)) {
     return 'klk';
-  } else if (isMusementBooking(referenceNumber)) {
+  } else if (isMusementBooking(otaPartnerRef)) {
     return 'mus';
-  } else if (isTiqetsBooking(referenceNumber)) {
+  } else if (isTiqetsBooking(otaPartnerRef)) {
     return 'tiq';
-  } else if (isCuriosidad(referenceNumber)) {
+  } else if (isCuriosidad(otaPartnerRef)) {
     return 'cur';
-  } else if (isTSKBooking(referenceNumber)) {
+  } else if (isCivitatisBooking(otaPartnerRef)) {
+    return 'civ';
+  } else if (isTSKBooking(otaPartnerRef)) {
     return 'tsk';
   }