ordering-ui-external 14.1.32 → 14.1.34

package/_modules/themes/five/src/components/ProductForm/index.js

@@ -77,7 +77,8 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
     handleCreateGuestUser = props.handleCreateGuestUser,
     actionStatus = props.actionStatus,
     isCustomerMode = props.isCustomerMode,
-    isAlsea = props.isAlsea;
+    isAlsea = props.isAlsea,
+    quesoYSalsaOptions = props.quesoYSalsaOptions;
   var product = productObject.product,
     loading = productObject.loading,
     error = productObject.error;
@@ -644,7 +645,8 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
           setIsScrollAvailable: setIsScrollAvailable,
           pizzaState: pizzaState,
           productCart: productCart,
-          isAlsea: isAlsea
+          isAlsea: isAlsea,
+          quesoYSalsaOptions: quesoYSalsaOptions
         });
       }))));
     });

package/_modules/themes/five/src/components/ProductOptionSubOption/index.js

@@ -36,7 +36,7 @@ var ProductOptionSubOptionPropsAreEqual = function ProductOptionSubOptionPropsAr
   return JSON.stringify(prevProps.state) === JSON.stringify(nextProps.state) && JSON.stringify(prevProps.pizzaState) === JSON.stringify(nextProps.pizzaState) && prevProps.balance === nextProps.balance && JSON.stringify(prevProps.productCart) === JSON.stringify(nextProps.productCart);
 };
 var ProductOptionSubOptionUI = /*#__PURE__*/_react.default.memo(function (props) {
-  var _pizzaState, _option$name, _option$name$toLowerC, _pizzaState2, _props$beforeElements, _props$beforeComponen, _option$name3, _pizzaState3, _pizzaState4, _props$afterComponent, _props$afterElements;
+  var _pizzaState, _option$name, _option$name$toLowerC, _pizzaState2, _props$beforeElements, _props$beforeComponen, _pizzaState3, _pizzaState4, _props$afterComponent, _props$afterElements;
   var state = props.state,
     increment = props.increment,
     decrement = props.decrement,
@@ -50,9 +50,10 @@ var ProductOptionSubOptionUI = /*#__PURE__*/_react.default.memo(function (props)
     usePizzaValidation = props.usePizzaValidation,
     pizzaState = props.pizzaState,
     changeQuantity = props.changeQuantity,
-    isAlsea = props.isAlsea;
+    isAlsea = props.isAlsea,
+    quesoYSalsaOptions = props.quesoYSalsaOptions;
   var disableIncrement = option !== null && option !== void 0 && option.with_half_option ? (pizzaState === null || pizzaState === void 0 || (_pizzaState = pizzaState["option:".concat(option === null || option === void 0 ? void 0 : option.id)]) === null || _pizzaState === void 0 ? void 0 : _pizzaState.value) >= (option === null || option === void 0 ? void 0 : option.max) : option !== null && option !== void 0 && option.limit_suboptions_by_max ? balance === (option === null || option === void 0 ? void 0 : option.max) || state.quantity === suboption.max : state.quantity === (suboption === null || suboption === void 0 ? void 0 : suboption.max) || !state.selected && balance === (option === null || option === void 0 ? void 0 : option.max);
-  var quesoYSalsa = (option === null || option === void 0 || (_option$name = option.name) === null || _option$name === void 0 || (_option$name$toLowerC = _option$name.toLowerCase) === null || _option$name$toLowerC === void 0 ? void 0 : _option$name$toLowerC.call(_option$name)) === 'queso y salsa';
+  var quesoYSalsa = quesoYSalsaOptions.includes(option === null || option === void 0 || (_option$name = option.name) === null || _option$name === void 0 || (_option$name$toLowerC = _option$name.toLowerCase) === null || _option$name$toLowerC === void 0 ? void 0 : _option$name$toLowerC.call(_option$name));
   var price = option !== null && option !== void 0 && option.with_half_option && suboption !== null && suboption !== void 0 && suboption.half_price && state.position !== 'whole' ? suboption === null || suboption === void 0 ? void 0 : suboption.half_price : suboption === null || suboption === void 0 ? void 0 : suboption.price;
   var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -120,10 +121,9 @@ var ProductOptionSubOptionUI = /*#__PURE__*/_react.default.memo(function (props)
     }, props));
   }), /*#__PURE__*/_react.default.createElement(_styles.Container, {
     onClick: function onClick(e) {
-      var _option$name2;
-      return (option === null || option === void 0 || (_option$name2 = option.name) === null || _option$name2 === void 0 ? void 0 : _option$name2.toLowerCase()) === 'queso y salsa' && isAlsea ? handleChangeQuantity(e, state.quantity === 0 ? 1 : 0) : handleSuboptionClick();
+      return quesoYSalsa && isAlsea ? handleChangeQuantity(e, state.quantity === 0 ? 1 : 0) : handleSuboptionClick();
     }
-  }, /*#__PURE__*/_react.default.createElement(_styles.LeftOptionContainer, null, /*#__PURE__*/_react.default.createElement(_styles.IconControl, null, (option === null || option === void 0 ? void 0 : option.min) === 0 && (option === null || option === void 0 ? void 0 : option.max) === 1 || (option === null || option === void 0 ? void 0 : option.max) > 1 ? state !== null && state !== void 0 && state.selected && !((option === null || option === void 0 || (_option$name3 = option.name) === null || _option$name3 === void 0 ? void 0 : _option$name3.toLowerCase()) === 'queso y salsa' && isAlsea && state.quantity === 0) ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, {
+  }, /*#__PURE__*/_react.default.createElement(_styles.LeftOptionContainer, null, /*#__PURE__*/_react.default.createElement(_styles.IconControl, null, (option === null || option === void 0 ? void 0 : option.min) === 0 && (option === null || option === void 0 ? void 0 : option.max) === 1 || (option === null || option === void 0 ? void 0 : option.max) > 1 ? state !== null && state !== void 0 && state.selected && !(quesoYSalsa && isAlsea && state.quantity === 0) ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, {
     disabled: true
   }) : state !== null && state !== void 0 && state.selected ? /*#__PURE__*/_react.default.createElement(_RiRadioButtonFill.default, null) : /*#__PURE__*/_react.default.createElement(_MdRadioButtonUnchecked.default, {
     disabled: true
@@ -156,7 +156,7 @@ var ProductOptionSubOptionUI = /*#__PURE__*/_react.default.memo(function (props)
     onClick: function onClick(e) {
       return handlePosition(e, 'right');
     }
-  }))), ((option === null || option === void 0 ? void 0 : option.with_half_option) || quesoYSalsa) && (state === null || state === void 0 ? void 0 : state.selected) && isAlsea && /*#__PURE__*/_react.default.createElement(_styles.ExtraControl, null, state.quantity >= 2 ? /*#__PURE__*/_react.default.createElement(_styles.ExtraItem, {
+  }))), ((option === null || option === void 0 ? void 0 : option.with_half_option) || quesoYSalsa) && (state === null || state === void 0 ? void 0 : state.selected) && state.quantity > 0 && isAlsea && /*#__PURE__*/_react.default.createElement(_styles.ExtraControl, null, state.quantity >= 2 ? /*#__PURE__*/_react.default.createElement(_styles.ExtraItem, {
     onClick: function onClick(e) {
       return handleChangeQuantity(e, 1);
     }

package/_modules/themes/five/src/components/SignUpForm/index.js

@@ -264,8 +264,8 @@ var SignUpFormUI = function SignUpFormUI(props) {
       var _configs$validation_p, _configs$validation_p2;
       phoneNumberParser = (0, _libphonenumberJs.default)(number);
       if (!parseInt((_configs$validation_p = configs === null || configs === void 0 || (_configs$validation_p2 = configs.validation_phone_number_lib) === null || _configs$validation_p2 === void 0 ? void 0 : _configs$validation_p2.value) !== null && _configs$validation_p !== void 0 ? _configs$validation_p : 1, 10)) {
-        var _phoneNumberParser;
-        if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number);
+        var _phoneNumberParser, _formatPhoneNumber, _formatPhoneNumber$re;
+        if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (_formatPhoneNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number)) === null || _formatPhoneNumber === void 0 || (_formatPhoneNumber$re = _formatPhoneNumber.replace) === null || _formatPhoneNumber$re === void 0 ? void 0 : _formatPhoneNumber$re.call(_formatPhoneNumber, /\s/g, '');
       }
     }
     if (phoneNumberParser) {

package/_modules/themes/five/src/components/UserFormDetails/index.js

@@ -253,8 +253,8 @@ var UserFormDetailsUI = exports.UserFormDetailsUI = function UserFormDetailsUI(p
       var _configs$validation_p, _configs$validation_p2;
       phoneNumberParser = (0, _libphonenumberJs.default)(number);
       if (!parseInt((_configs$validation_p = configs === null || configs === void 0 || (_configs$validation_p2 = configs.validation_phone_number_lib) === null || _configs$validation_p2 === void 0 ? void 0 : _configs$validation_p2.value) !== null && _configs$validation_p !== void 0 ? _configs$validation_p : 1, 10)) {
-        var _phoneNumberParser;
-        if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number);
+        var _phoneNumberParser, _formatPhoneNumber, _formatPhoneNumber$re;
+        if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (_formatPhoneNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number)) === null || _formatPhoneNumber === void 0 || (_formatPhoneNumber$re = _formatPhoneNumber.replace) === null || _formatPhoneNumber$re === void 0 ? void 0 : _formatPhoneNumber$re.call(_formatPhoneNumber, /\s/g, '');
       }
     }
     if (phoneNumberParser) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "14.1.32",
+  "version": "14.1.34",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -88,7 +88,7 @@
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
     "nanoid": "^4.0.0",
-    "ordering-components-external": "13.0.34",
+    "ordering-components-external": "13.0.35",
     "payment": "^2.4.6",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",

package/src/themes/five/src/components/ProductForm/index.js

@@ -103,7 +103,8 @@ const ProductOptionsUI = (props) => {
     handleCreateGuestUser,
     actionStatus,
     isCustomerMode,
-    isAlsea
+    isAlsea,
+    quesoYSalsaOptions
   } = props
 
   const { product, loading, error } = productObject
@@ -673,6 +674,7 @@ const ProductOptionsUI = (props) => {
                                       pizzaState={pizzaState}
                                       productCart={productCart}
                                       isAlsea={isAlsea}
+                                      quesoYSalsaOptions={quesoYSalsaOptions}
                                     />
                                   )
                                 })

package/src/themes/five/src/components/ProductOptionSubOption/index.js

@@ -50,7 +50,8 @@ const ProductOptionSubOptionUI = React.memo((props) => {
     usePizzaValidation,
     pizzaState,
     changeQuantity,
-    isAlsea
+    isAlsea,
+    quesoYSalsaOptions
   } = props
 
   const disableIncrement =
@@ -60,7 +61,7 @@ const ProductOptionSubOptionUI = React.memo((props) => {
         ? (balance === option?.max || state.quantity === suboption.max)
         : state.quantity === suboption?.max || (!state.selected && balance === option?.max)
 
-  const quesoYSalsa = option?.name?.toLowerCase?.() === 'queso y salsa'
+  const quesoYSalsa = quesoYSalsaOptions.includes(option?.name?.toLowerCase?.())
   const price = option?.with_half_option && suboption?.half_price && state.position !== 'whole' ? suboption?.half_price : suboption?.price
   const [, t] = useLanguage()
   const [{ parsePrice }] = useUtils()
@@ -122,11 +123,11 @@ const ProductOptionSubOptionUI = React.memo((props) => {
         </React.Fragment>))}
       {props.beforeComponents?.map((BeforeComponent, i) => (
         <BeforeComponent key={i} {...props} />))}
-      <Container onClick={(e) => option?.name?.toLowerCase() === 'queso y salsa' && isAlsea ? handleChangeQuantity(e, state.quantity === 0 ? 1 : 0) : handleSuboptionClick()}>
+      <Container onClick={(e) => quesoYSalsa && isAlsea ? handleChangeQuantity(e, state.quantity === 0 ? 1 : 0) : handleSuboptionClick()}>
         <LeftOptionContainer>
           <IconControl>
             {((option?.min === 0 && option?.max === 1) || option?.max > 1) ? (
-              state?.selected && !(option?.name?.toLowerCase() === 'queso y salsa' && isAlsea && state.quantity === 0) ? (
+              state?.selected && !(quesoYSalsa && isAlsea && state.quantity === 0) ? (
                 <MdCheckBox />
               ) : (
                 <MdCheckBoxOutlineBlank disabled />
@@ -188,7 +189,7 @@ const ProductOptionSubOptionUI = React.memo((props) => {
               )
             }
           </PositionControl>
-          {(option?.with_half_option || quesoYSalsa) && state?.selected && isAlsea && (
+          {(option?.with_half_option || quesoYSalsa) && state?.selected && state.quantity > 0 && isAlsea && (
             <ExtraControl>
               {(state.quantity >= 2) ? (
                 <ExtraItem

package/src/themes/five/src/components/SignUpForm/index.js

@@ -232,7 +232,7 @@ const SignUpFormUI = (props) => {
     if (isValid) {
       phoneNumberParser = parsePhoneNumber(number)
       if (!parseInt(configs?.validation_phone_number_lib?.value ?? 1, 10)) {
-        if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)
+        if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)?.replace?.(/\s/g, '')
       }
     }
     if (phoneNumberParser) {

package/src/themes/five/src/components/UserFormDetails/index.js

@@ -208,7 +208,7 @@ export const UserFormDetailsUI = (props) => {
     if (isValid) {
       phoneNumberParser = parsePhoneNumber(number)
       if (!parseInt(configs?.validation_phone_number_lib?.value ?? 1, 10)) {
-        if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)
+        if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)?.replace?.(/\s/g, '')
       }
     }
     if (phoneNumberParser) {