ordering-components-external 13.0.34 → 13.0.35

package/_modules/components/ProductForm/index.js

@@ -251,6 +251,11 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
    */
   var isAlsea = ['alsea', 'alsea-staging'].includes(ordering.project);
 
+  /**
+   * alsea custom options
+   */
+  var quesoYSalsaOptions = ['queso y salsa', 'queso mozzarella y salsa'];
+
   /**
    * Init product cart status
    * @param {object} product Product to init product cart status
@@ -655,7 +660,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
           name: cartSuboption.name,
           position: (state === null || state === void 0 ? void 0 : state.id) === (cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.id) ? state === null || state === void 0 ? void 0 : state.position : cartSuboption.position || 'whole',
           price: (state === null || state === void 0 ? void 0 : state.id) === (cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.id) ? state.price : price,
-          quantity: (state === null || state === void 0 ? void 0 : state.id) === (cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.id) ? state.quantity : ((_preselectedOptions$i3 = preselectedOptions[i]) === null || _preselectedOptions$i3 === void 0 || (_preselectedOptions$i3 = _preselectedOptions$i3.name) === null || _preselectedOptions$i3 === void 0 ? void 0 : _preselectedOptions$i3.toLowerCase()) === 'queso y salsa' && isAlsea ? (_cartSuboption$quanti = cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.quantity) !== null && _cartSuboption$quanti !== void 0 ? _cartSuboption$quanti : 1 : (cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.quantity) || 1,
+          quantity: (state === null || state === void 0 ? void 0 : state.id) === (cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.id) ? state.quantity : quesoYSalsaOptions.includes((_preselectedOptions$i3 = preselectedOptions[i]) === null || _preselectedOptions$i3 === void 0 || (_preselectedOptions$i3 = _preselectedOptions$i3.name) === null || _preselectedOptions$i3 === void 0 ? void 0 : _preselectedOptions$i3.toLowerCase()) && isAlsea ? (_cartSuboption$quanti = cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.quantity) !== null && _cartSuboption$quanti !== void 0 ? _cartSuboption$quanti : 1 : (cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.quantity) || 1,
           selected: true,
           total: (state === null || state === void 0 ? void 0 : state.id) === (cartSuboption === null || cartSuboption === void 0 ? void 0 : cartSuboption.id) ? state.total : price
         };
@@ -786,7 +791,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
         if ((option === null || option === void 0 || (_option$suboptions3 = option.suboptions) === null || _option$suboptions3 === void 0 ? void 0 : _option$suboptions3.length) > 0 && evaluate) {
           if (option.min > quantity) {
             errors["id:".concat(option.id)] = true;
-          } else if (option.max < quantity) {
+          } else if (option.max < quantity && option !== null && option !== void 0 && option.with_half_option && isAlsea && option.max + 0.5 < quantity) {
             errors["id:".concat(option.id)] = true;
           }
         }
@@ -1383,7 +1388,8 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
     handleChangeCommentState: handleChangeCommentState,
     professionalListState: professionalListState,
     cart2: props.productCart,
-    isAlsea: isAlsea
+    isAlsea: isAlsea,
+    quesoYSalsaOptions: quesoYSalsaOptions
   })));
 };
 ProductForm.propTypes = {

package/_modules/components/ProductOptionSuboption/index.js

@@ -26,7 +26,8 @@ var ProductOptionSuboption = exports.ProductOptionSuboption = function ProductOp
     onChange = props.onChange,
     isOrigin = props.isOrigin,
     pizzaState = props.pizzaState,
-    isAlsea = props.isAlsea;
+    isAlsea = props.isAlsea,
+    quesoYSalsaOptions = props.quesoYSalsaOptions;
 
   /**
    * Predefine default values for suboption state
@@ -37,7 +38,7 @@ var ProductOptionSuboption = exports.ProductOptionSuboption = function ProductOp
     quantity = props.state.quantity;
   } else if (selected) {
     var _option$name;
-    quantity = (option === null || option === void 0 || (_option$name = option.name) === null || _option$name === void 0 ? void 0 : _option$name.toLowerCase()) === 'queso y salsa' && isAlsea ? props.state.quantity : 1;
+    quantity = quesoYSalsaOptions.includes(option === null || option === void 0 || (_option$name = option.name) === null || _option$name === void 0 ? void 0 : _option$name.toLowerCase()) && isAlsea ? props.state.quantity : 1;
   }
   var position = props.state.position || 'whole';
   var price = option.with_half_option && suboption.half_price && position !== 'whole' ? suboption.half_price : suboption.price;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.0.34",
+  "version": "13.0.35",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/ProductForm/index.js

@@ -158,6 +158,11 @@ export const ProductForm = (props) => {
    */
   const isAlsea = ['alsea', 'alsea-staging'].includes(ordering.project)
 
+  /**
+   * alsea custom options
+   */
+  const quesoYSalsaOptions = ['queso y salsa', 'queso mozzarella y salsa']
+
   /**
    * Init product cart status
    * @param {object} product Product to init product cart status
@@ -422,7 +427,7 @@ export const ProductForm = (props) => {
           price: state?.id === cartSuboption?.id ? state.price : price,
           quantity: state?.id === cartSuboption?.id
             ? state.quantity
-            : preselectedOptions[i]?.name?.toLowerCase() === 'queso y salsa' && isAlsea
+            : quesoYSalsaOptions.includes(preselectedOptions[i]?.name?.toLowerCase()) && isAlsea
               ? cartSuboption?.quantity ?? 1
               : cartSuboption?.quantity || 1,
           selected: true,
@@ -552,7 +557,7 @@ export const ProductForm = (props) => {
         if (option?.suboptions?.length > 0 && evaluate) {
           if (option.min > quantity) {
             errors[`id:${option.id}`] = true
-          } else if (option.max < quantity) {
+          } else if (option.max < quantity && (option?.with_half_option && isAlsea && (option.max + 0.5 < quantity))) {
             errors[`id:${option.id}`] = true
           }
         }
@@ -1041,6 +1046,7 @@ export const ProductForm = (props) => {
             professionalListState={professionalListState}
             cart2={props.productCart}
             isAlsea={isAlsea}
+            quesoYSalsaOptions={quesoYSalsaOptions}
           />
         )
       }

package/src/components/ProductOptionSuboption/index.js

@@ -13,7 +13,8 @@ export const ProductOptionSuboption = (props) => {
     onChange,
     isOrigin,
     pizzaState,
-    isAlsea
+    isAlsea,
+    quesoYSalsaOptions
   } = props
 
   /**
@@ -24,7 +25,7 @@ export const ProductOptionSuboption = (props) => {
   if (selected && props.state.quantity && props.state.quantity > 0) {
     quantity = props.state.quantity
   } else if (selected) {
-    quantity = option?.name?.toLowerCase() === 'queso y salsa' && isAlsea ? props.state.quantity : 1
+    quantity = quesoYSalsaOptions.includes(option?.name?.toLowerCase()) && isAlsea ? props.state.quantity : 1
   }
   const position = props.state.position || 'whole'
   const price = option.with_half_option && suboption.half_price && position !== 'whole' ? suboption.half_price : suboption.price