ordering-ui-external 14.1.55 → 14.1.56

package/_modules/utils/index.js

@@ -173,7 +173,7 @@ var lightenDarkenColor = exports.lightenDarkenColor = function lightenDarkenColo
     b = color[3];
   } else {
     // If RGB --> Convert it to HEX
-    color = +("0x" + color.slice(1).replace(color.length < 5 && /./g, '$&$&'));
+    color = +('0x' + color.slice(1).replace(color.length < 5 && /./g, '$&$&'));
     r = color >> 16;
     g = color >> 8 & 255;
     b = color & 255;
@@ -184,7 +184,7 @@ var lightenDarkenColor = exports.lightenDarkenColor = function lightenDarkenColo
 
   // Using the HSP value, determine whether the color is light or dark
   if (hsp > 197) {
-    return true; //is light color
+    return true; // is light color
   } else {
     return false;
   }
@@ -1128,36 +1128,30 @@ var calendarLanguages = exports.calendarLanguages = {
   }
 };
 var getCateringValues = exports.getCateringValues = function getCateringValues(cateringTypeString, configs) {
-  var splitCateringValue;
-  if (configs !== null && configs !== void 0 && configs.preorder_slot_interval) {
-    splitCateringValue = function splitCateringValue(configName) {
-      var _configs$configName;
-      return (_configs$configName = configs[configName]) === null || _configs$configName === void 0 || (_configs$configName = _configs$configName.value) === null || _configs$configName === void 0 || (_configs$configName = _configs$configName.split('|')) === null || _configs$configName === void 0 || (_configs$configName = _configs$configName.find(function (val) {
+  var getValue = function getValue(configName) {
+    var config = configs === null || configs === void 0 ? void 0 : configs[configName];
+    if (config && config.value) {
+      var _config$value$split$f;
+      var value = (_config$value$split$f = config.value.split('|').find(function (val) {
         return val.includes(cateringTypeString);
-      })) === null || _configs$configName === void 0 ? void 0 : _configs$configName.split(',')[1];
-    };
-  } else {
-    splitCateringValue = function splitCateringValue(configName) {
-      var _Object$values;
-      return (_Object$values = Object.values(configs || {})) === null || _Object$values === void 0 || (_Object$values = _Object$values.find(function (config) {
-        return (config === null || config === void 0 ? void 0 : config.key) === configName;
-      })) === null || _Object$values === void 0 || (_Object$values = _Object$values.value) === null || _Object$values === void 0 || (_Object$values = _Object$values.split('|')) === null || _Object$values === void 0 || (_Object$values = _Object$values.find(function (val) {
-        return val.includes(cateringTypeString);
-      })) === null || _Object$values === void 0 ? void 0 : _Object$values.split(',')[1];
-    };
-  }
-  var preorderSlotInterval = parseInt(splitCateringValue('preorder_slot_interval'));
-  var preorderLeadTime = parseInt(splitCateringValue('preorder_lead_time'));
-  var preorderTimeRange = parseInt(splitCateringValue('preorder_time_range'));
-  var preorderMaximumDays = parseInt(splitCateringValue('preorder_maximum_days'));
-  var preorderMinimumDays = parseInt(splitCateringValue('preorder_minimum_days'));
-  return {
-    preorderSlotInterval: preorderSlotInterval,
-    preorderLeadTime: preorderLeadTime,
-    preorderTimeRange: preorderTimeRange,
-    preorderMaximumDays: preorderMaximumDays,
-    preorderMinimumDays: preorderMinimumDays
+      })) === null || _config$value$split$f === void 0 ? void 0 : _config$value$split$f.split(',')[1];
+      return isNaN(value) ? null : parseInt(value);
+    }
+    return null;
+  };
+  var values = {
+    preorderSlotInterval: getValue('preorder_slot_interval'),
+    preorderLeadTime: getValue('preorder_lead_time'),
+    preorderTimeRange: getValue('preorder_time_range'),
+    preorderMaximumDays: getValue('preorder_maximum_days'),
+    preorderMinimumDays: getValue('preorder_minimum_days')
   };
+  return Object.fromEntries(Object.entries(values).filter(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+      _ = _ref4[0],
+      v = _ref4[1];
+    return v !== null;
+  }));
 };
 var getCurrenySymbol = exports.getCurrenySymbol = function getCurrenySymbol(code) {
   var _CURRENCY$code$symbol, _CURRENCY$code;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "14.1.55",
+  "version": "14.1.56",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {

package/src/utils/index.js

@@ -118,7 +118,7 @@ export const getTraduction = key => {
     ERROR_PLACE_PAY_WITH_PAYPAL_CAPTURE: 'An error occurred while trying to pay by PayPal',
     ERROR_ADD_PRODUCT_VERY_FAR_FOR_DELIVERY: 'Error adding product, very far for delivery',
     ERROR_INVALID_OFFER: 'The offer doesn\'t exist',
-    ERROR_CASH_WALLET_FEATURE_DISABLED: 'Cash wallet feature is disabled',
+    ERROR_CASH_WALLET_FEATURE_DISABLED: 'Cash wallet feature is disabled'
   }
 
   return keyList[key] ? t(key, keyList[key]) : t(key)
@@ -136,7 +136,6 @@ export const bytesConverter = bytes => {
  * Function to get brightness of color.
  */
 export const lightenDarkenColor = (color) => {
-
   let r, g, b, hsp
   if (color.match(/^rgb/)) {
     // If HEX --> store the red, green, blue values in separate variables
@@ -147,7 +146,7 @@ export const lightenDarkenColor = (color) => {
     b = color[3]
   } else {
     // If RGB --> Convert it to HEX
-    color = +("0x" + color.slice(1).replace(color.length < 5 && /./g, '$&$&'))
+    color = +('0x' + color.slice(1).replace(color.length < 5 && /./g, '$&$&'))
 
     r = color >> 16
     g = color >> 8 & 255
@@ -163,7 +162,7 @@ export const lightenDarkenColor = (color) => {
 
   // Using the HSP value, determine whether the color is light or dark
   if (hsp > 197) {
-    return true //is light color
+    return true // is light color
   } else {
     return false
   }
@@ -678,7 +677,7 @@ export const getOrderStatuPickUp = (s) => {
     { key: 16, value: t('ORDER_STATUS_CANCELLED_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_STATUS_CANCELLED_BY_CUSTOMER || 'Order cancelled by customer'), slug: 'ORDER_STATUS_CANCELLED_BY_CUSTOMER', percentage: 0 },
     { key: 17, value: t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_NOT_PICKEDUP_BY_CUSTOMER || 'Order not picked up by customer'), slug: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER', percentage: 0 },
     { key: 20, value: t('ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS || 'Customer almost arrived to business'), slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', percentage: 70 },
-    { key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ARRIVED_BUSINESS || 'Customer arrived to business'), slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS', percentage: 90 },
+    { key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ARRIVED_BUSINESS || 'Customer arrived to business'), slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS', percentage: 90 }
   ]
   const objectStatus = orderStatus.find((o) => o.key === status)
   return objectStatus && objectStatus
@@ -711,30 +710,24 @@ export const calendarLanguages = {
 }
 
 export const getCateringValues = (cateringTypeString, configs) => {
-  let splitCateringValue
-  if (configs?.preorder_slot_interval) {
-    splitCateringValue = (configName) => configs[configName]
-      ?.value?.split('|')
-      ?.find(val => val.includes(cateringTypeString))?.split(',')[1]
-  } else {
-    splitCateringValue = (configName) => Object.values(configs || {})
-      ?.find(config => config?.key === configName)
-      ?.value?.split('|')
-      ?.find(val => val.includes(cateringTypeString))?.split(',')[1]
+  const getValue = (configName) => {
+    const config = configs?.[configName]
+    if (config && config.value) {
+      const value = config.value.split('|').find(val => val.includes(cateringTypeString))?.split(',')[1]
+      return isNaN(value) ? null : parseInt(value)
+    }
+    return null
   }
-  const preorderSlotInterval = parseInt(splitCateringValue('preorder_slot_interval'))
-  const preorderLeadTime = parseInt(splitCateringValue('preorder_lead_time'))
-  const preorderTimeRange = parseInt(splitCateringValue('preorder_time_range'))
-  const preorderMaximumDays = parseInt(splitCateringValue('preorder_maximum_days'))
-  const preorderMinimumDays = parseInt(splitCateringValue('preorder_minimum_days'))
-
-  return {
-    preorderSlotInterval,
-    preorderLeadTime,
-    preorderTimeRange,
-    preorderMaximumDays,
-    preorderMinimumDays
+
+  const values = {
+    preorderSlotInterval: getValue('preorder_slot_interval'),
+    preorderLeadTime: getValue('preorder_lead_time'),
+    preorderTimeRange: getValue('preorder_time_range'),
+    preorderMaximumDays: getValue('preorder_maximum_days'),
+    preorderMinimumDays: getValue('preorder_minimum_days')
   }
+
+  return Object.fromEntries(Object.entries(values).filter(([_, v]) => v !== null))
 }
 
 export const getCurrenySymbol = (code) => {