tripstorekrabi-shared 1.6.2 → 1.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.6.2",
+  "version": "1.6.5",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer",
   "repository": {

package/price.js

@@ -15,9 +15,9 @@ export function calculateProductPrice(booking, pricing, selling = true) {
       } else {
         let bookingType = getBookingType(booking.referenceNumber);
 
-        if (volume[bookingType]?.active) {
+        if (volume[bookingType]) {
           let customPricing = volume[bookingType];
-          total = booking.adults * (selling ? customPricing.adult.partnerNetPrice : customPricing.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (selling ? customPricing.child.partnerNetPrice : customPricing.child.operatorNetPrice) : 0);
+          total = booking.adults * (selling ? customPricing.adult.partnerNetPrice : customPricing.adult.operatorNetPrice ?? volume.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (selling ? customPricing.child.partnerNetPrice : customPricing.child.operatorNetPrice ?? volume.child.operatorNetPrice) : 0);
         } else {
           total = booking.adults * (selling ? volume.adult.sellingPrice : volume.adult.operatorNetPrice) + (pricing.ageBands.child.active && volume.child && booking.children ? booking.children * (selling ? volume.child.sellingPrice : volume.child.operatorNetPrice) : 0);
         }
@@ -32,9 +32,9 @@ export function calculateProductPrice(booking, pricing, selling = true) {
       } else {
         let bookingType = getBookingType(booking.referenceNumber);
 
-        if (volume[bookingType]?.active) {
+        if (volume[bookingType]) {
           let customPricing = volume[bookingType];
-          total = selling ? customPricing.partnerNetPrice : customPricing.operatorNetPrice;
+          total = selling ? customPricing.partnerNetPrice : customPricing.operatorNetPrice ?? volume.operatorNetPrice;
         } else {
           total = (selling ? volume.sellingPrice : volume.operatorNetPrice);
         }

package/utils.js

@@ -292,16 +292,6 @@ export function isNumeric(n) {
   return !isNaN(parseFloat(n)) && isFinite(n);
 }
 
-export function validURL(str) {
-  var pattern = new RegExp('^(https?:\\/\\/)?' + // protocol
-    '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
-    '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-    '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-    '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-    '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-  return !!pattern.test(str);
-}
-
 export function getBookingSummary(booking, options = {}) {
   let summary = "";
   if (!options.excludeReferenceNumber) {