ordering-ui-external 14.1.84 → 14.1.86

package/_modules/components/UpsellingPage/index.js

@@ -148,8 +148,11 @@ var UpsellingPageUI = function UpsellingPageUI(props) {
   })));
 };
 var UpsellingPage = exports.UpsellingPage = function UpsellingPage(props) {
+  var _JSON$parse;
+  var useSuggestiveUpselling = (_JSON$parse = JSON.parse(window.localStorage.getItem('suggestive-upselling'))) !== null && _JSON$parse !== void 0 ? _JSON$parse : false;
   var UpsellingPageProps = _objectSpread(_objectSpread({}, props), {}, {
-    UIComponent: UpsellingPageUI
+    UIComponent: UpsellingPageUI,
+    useSuggestiveUpselling: useSuggestiveUpselling
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsExternal.UpsellingPage, UpsellingPageProps);
 };

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

@@ -55,7 +55,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 _swiper.default.use([_swiper.Navigation, _swiper.Thumbs]);
 var ProductOptionsUI = function ProductOptionsUI(props) {
-  var _configs$unaddressed_, _configs$guest_checko, _orderState$options, _configs$allowed_orde, _orderState$options2, _theme$business_view, _theme$business_view2, _theme$business_view3, _theme$defaultLanguag, _product$tags, _product$ingredients2, _product$extras, _product$ingredients3, _product$ingredients4, _product$ingredients5, _product$extras2, _theme$defaultLanguag2, _theme$defaultLanguag3, _props$afterMidElemen, _props$afterMidCompon, _orderState$options3, _orderState$options4, _orderState$options5, _orderState$options6, _theme$defaultLanguag4, _theme$defaultLanguag5, _theme$defaultLanguag6, _orderState$options7, _orderState$options8, _theme$defaultLanguag7, _orderState$options9, _theme$defaultLanguag8, _theme$defaultLanguag9, _theme$defaultLanguag10, _theme$defaultLanguag11, _theme$defaultLanguag12, _theme$defaultLanguag13, _error$;
+  var _configs$unaddressed_, _configs$guest_checko, _orderState$options, _configs$allowed_orde, _orderState$options2, _theme$business_view, _theme$business_view2, _theme$business_view3, _theme$defaultLanguag, _product$tags, _product$ingredients2, _product$extras3, _product$ingredients3, _product$extras4, _product$ingredients4, _product$ingredients5, _product$extras5, _theme$defaultLanguag2, _theme$defaultLanguag3, _props$afterMidElemen, _props$afterMidCompon, _orderState$options3, _orderState$options4, _orderState$options5, _orderState$options6, _theme$defaultLanguag4, _theme$defaultLanguag5, _theme$defaultLanguag6, _orderState$options7, _orderState$options8, _theme$defaultLanguag7, _orderState$options9, _theme$defaultLanguag8, _theme$defaultLanguag9, _theme$defaultLanguag10, _theme$defaultLanguag11, _theme$defaultLanguag12, _theme$defaultLanguag13, _error$;
   var businessSlug = props.businessSlug,
     editMode = props.editMode,
     isSoldOut = props.isSoldOut,
@@ -309,17 +309,19 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
   (0, _react.useEffect)(function () {
     var scrollElement = document.querySelector('.popup-dialog');
     var handleScroll = function handleScroll() {
+      var _product$extras;
       var extraHeight = 60;
-      if ((product === null || product === void 0 ? void 0 : product.ingredients.length) > 0 || (product === null || product === void 0 ? void 0 : product.extras.length) > 0) {
-        var _product$ingredients;
+      if ((product === null || product === void 0 ? void 0 : product.ingredients.length) > 0 || (product === null || product === void 0 || (_product$extras = product.extras) === null || _product$extras === void 0 ? void 0 : _product$extras.length) > 0) {
+        var _product$ingredients, _product$extras2;
         var menuList = [];
         if ((product === null || product === void 0 || (_product$ingredients = product.ingredients) === null || _product$ingredients === void 0 ? void 0 : _product$ingredients.length) > 0) {
           menuList.push('ingredients');
         }
-        ((product === null || product === void 0 ? void 0 : product.extras.length) > 0 && (product === null || product === void 0 ? void 0 : product.extras) || []).sort(function (a, b) {
+        ((product === null || product === void 0 || (_product$extras2 = product.extras) === null || _product$extras2 === void 0 ? void 0 : _product$extras2.length) > 0 && (product === null || product === void 0 ? void 0 : product.extras) || []).sort(function (a, b) {
           return a.rank - b.rank;
         }).forEach(function (extra) {
-          ((extra === null || extra === void 0 ? void 0 : extra.options.length) > 0 && (extra === null || extra === void 0 ? void 0 : extra.options) || []).sort(function (a, b) {
+          var _extra$options;
+          ((extra === null || extra === void 0 || (_extra$options = extra.options) === null || _extra$options === void 0 ? void 0 : _extra$options.length) > 0 && (extra === null || extra === void 0 ? void 0 : extra.options) || []).sort(function (a, b) {
             return a.rank - b.rank;
           }).forEach(function (option) {
             showOption(option) && menuList.push("id_".concat(option === null || option === void 0 ? void 0 : option.id));
@@ -567,7 +569,7 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
       src: optimizeImage((tag === null || tag === void 0 ? void 0 : tag.image) || ((_theme$images2 = theme.images) === null || _theme$images2 === void 0 || (_theme$images2 = _theme$images2.dummies) === null || _theme$images2 === void 0 ? void 0 : _theme$images2.product), 'h_40,c_limit'),
       alt: ""
     }), /*#__PURE__*/_react.default.createElement("span", null, tag.name));
-  })), /*#__PURE__*/_react.default.createElement(_styles.Divider, null), /*#__PURE__*/_react.default.createElement(_styles.ProductEdition, null, ((product === null || product === void 0 || (_product$ingredients2 = product.ingredients) === null || _product$ingredients2 === void 0 ? void 0 : _product$ingredients2.length) > 0 || (product === null || product === void 0 || (_product$extras = product.extras) === null || _product$extras === void 0 ? void 0 : _product$extras.length) > 0) && /*#__PURE__*/_react.default.createElement(_styles.ProductTabContainer, {
+  })), /*#__PURE__*/_react.default.createElement(_styles.Divider, null), /*#__PURE__*/_react.default.createElement(_styles.ProductEdition, null, ((product === null || product === void 0 || (_product$ingredients2 = product.ingredients) === null || _product$ingredients2 === void 0 ? void 0 : _product$ingredients2.length) > 0 || (product === null || product === void 0 || (_product$extras3 = product.extras) === null || _product$extras3 === void 0 ? void 0 : _product$extras3.length) > 0) && /*#__PURE__*/_react.default.createElement(_styles.ProductTabContainer, {
     id: "all"
   }, /*#__PURE__*/_react.default.createElement(_Tabs.Tabs, null, /*#__PURE__*/_react.default.createElement(_AutoScroll.AutoScroll, {
     scrollId: "optionList"
@@ -579,12 +581,12 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
       return handleChangeTabValue('ingredients');
     },
     borderBottom: true
-  }, t('INGREDIENTS', 'ingredients')), product === null || product === void 0 ? void 0 : product.extras.sort(function (a, b) {
-    return a.rank - b.rank;
+  }, t('INGREDIENTS', 'ingredients')), product === null || product === void 0 || (_product$extras4 = product.extras) === null || _product$extras4 === void 0 ? void 0 : _product$extras4.sort(function (a, b) {
+    return (a === null || a === void 0 ? void 0 : a.rank) - (b === null || b === void 0 ? void 0 : b.rank);
   }).map(function (extra) {
-    var _extra$options;
-    return (_extra$options = extra.options) === null || _extra$options === void 0 ? void 0 : _extra$options.sort(function (a, b) {
-      return a.rank - b.rank;
+    var _extra$options2;
+    return extra === null || extra === void 0 || (_extra$options2 = extra.options) === null || _extra$options2 === void 0 ? void 0 : _extra$options2.sort(function (a, b) {
+      return (a === null || a === void 0 ? void 0 : a.rank) - (b === null || b === void 0 ? void 0 : b.rank);
     }).map(function (option) {
       return showOption(option) && /*#__PURE__*/_react.default.createElement(_Tabs.Tab, {
         key: option === null || option === void 0 ? void 0 : option.id,
@@ -608,11 +610,12 @@ var ProductOptionsUI = function ProductOptionsUI(props) {
       onChange: handleChangeIngredientState,
       isSoldOut: isSoldOut
     });
-  }))), /*#__PURE__*/_react.default.createElement("div", null, product === null || product === void 0 || (_product$extras2 = product.extras) === null || _product$extras2 === void 0 ? void 0 : _product$extras2.sort(function (a, b) {
-    return a.rank - b.rank;
+  }))), /*#__PURE__*/_react.default.createElement("div", null, product === null || product === void 0 || (_product$extras5 = product.extras) === null || _product$extras5 === void 0 ? void 0 : _product$extras5.sort(function (a, b) {
+    return (a === null || a === void 0 ? void 0 : a.rank) - (b === null || b === void 0 ? void 0 : b.rank);
   }).map(function (extra) {
-    return extra.options.sort(function (a, b) {
-      return a.rank - b.rank;
+    var _extra$options3;
+    return extra === null || extra === void 0 || (_extra$options3 = extra.options) === null || _extra$options3 === void 0 ? void 0 : _extra$options3.sort(function (a, b) {
+      return (a === null || a === void 0 ? void 0 : a.rank) - (b === null || b === void 0 ? void 0 : b.rank);
     }).map(function (option) {
       var currentState = productCart.options["id:".concat(option === null || option === void 0 ? void 0 : option.id)] || {};
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {

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

@@ -18,16 +18,16 @@ var _AutoScroll = require("../AutoScroll");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -35,14 +35,15 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var UpsellingPageUI = function UpsellingPageUI(props) {
-  var _theme$business_view, _upsellingProducts$pr4;
+  var _theme$business_view, _upsellingProducts$pr4, _actualProduct$api;
   var upsellingProducts = props.upsellingProducts,
     handleUpsellingPage = props.handleUpsellingPage,
     openUpselling = props.openUpselling,
     canOpenUpselling = props.canOpenUpselling,
     setCanOpenUpselling = props.setCanOpenUpselling,
     business = props.business,
-    isCustomMode = props.isCustomMode;
+    isCustomMode = props.isCustomMode,
+    businessId = props.businessId;
   var _useLanguage = (0, _orderingComponentsExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -77,7 +78,11 @@ var UpsellingPageUI = function UpsellingPageUI(props) {
     if ((upsellingProducts === null || upsellingProducts === void 0 ? void 0 : upsellingProducts.products.length) > 0) setShowUpSelling(true);else setShowUpSelling(false);
   }, [upsellingProducts === null || upsellingProducts === void 0 ? void 0 : upsellingProducts.products.length]);
   var handleFormProduct = function handleFormProduct(product) {
-    setActualProduct(product);
+    setActualProduct(_objectSpread(_objectSpread({}, product), {}, {
+      api: _objectSpread(_objectSpread({}, product === null || product === void 0 ? void 0 : product.api), {}, {
+        businessId: businessId
+      })
+    }));
     setModalIsOpen(true);
   };
   var handleSaveProduct = function handleSaveProduct() {
@@ -185,7 +190,7 @@ var UpsellingPageUI = function UpsellingPageUI(props) {
   }, actualProduct && /*#__PURE__*/_react.default.createElement(_ProductForm.ProductForm, {
     useKioskApp: props.useKioskApp,
     product: actualProduct,
-    businessId: actualProduct.api.businessId,
+    businessId: actualProduct === null || actualProduct === void 0 || (_actualProduct$api = actualProduct.api) === null || _actualProduct$api === void 0 ? void 0 : _actualProduct$api.businessId,
     businessSlug: business.slug,
     onSave: function onSave() {
       return handleSaveProduct();
@@ -193,8 +198,11 @@ var UpsellingPageUI = function UpsellingPageUI(props) {
   })));
 };
 var UpsellingPage = exports.UpsellingPage = function UpsellingPage(props) {
+  var _JSON$parse;
+  var useSuggestiveUpselling = (_JSON$parse = JSON.parse(window.localStorage.getItem('suggestive-upselling'))) !== null && _JSON$parse !== void 0 ? _JSON$parse : false;
   var UpsellingPageProps = _objectSpread(_objectSpread({}, props), {}, {
-    UIComponent: UpsellingPageUI
+    UIComponent: UpsellingPageUI,
+    useSuggestiveUpselling: useSuggestiveUpselling
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsExternal.UpsellingPage, UpsellingPageProps);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "14.1.84",
+  "version": "14.1.86",
   "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.2.17",
+    "ordering-components-external": "13.2.20",
     "payment": "^2.4.6",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",

package/src/components/UpsellingPage/index.js

@@ -141,9 +141,11 @@ const UpsellingPageUI = (props) => {
 }
 
 export const UpsellingPage = (props) => {
+  const useSuggestiveUpselling = JSON.parse(window.localStorage.getItem('suggestive-upselling')) ?? false
   const UpsellingPageProps = {
     ...props,
-    UIComponent: UpsellingPageUI
+    UIComponent: UpsellingPageUI,
+    useSuggestiveUpselling
   }
 
   return <UpsellingPageController {...UpsellingPageProps} />

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

@@ -289,13 +289,13 @@ const ProductOptionsUI = (props) => {
     const scrollElement = document.querySelector('.popup-dialog')
     const handleScroll = () => {
       const extraHeight = 60
-      if (product?.ingredients.length > 0 || product?.extras.length > 0) {
+      if (product?.ingredients.length > 0 || product?.extras?.length > 0) {
         const menuList = []
         if (product?.ingredients?.length > 0) {
           menuList.push('ingredients')
         }
-        ((product?.extras.length > 0 && product?.extras) || []).sort((a, b) => a.rank - b.rank).forEach(extra => {
-          ((extra?.options.length > 0 && extra?.options) || []).sort((a, b) => a.rank - b.rank).forEach(option => {
+        ((product?.extras?.length > 0 && product?.extras) || []).sort((a, b) => a.rank - b.rank).forEach(extra => {
+          ((extra?.options?.length > 0 && extra?.options) || []).sort((a, b) => a.rank - b.rank).forEach(option => {
             showOption(option) && menuList.push(`id_${option?.id}`)
           })
         })
@@ -604,7 +604,7 @@ const ProductOptionsUI = (props) => {
                           )
                         }
                         {
-                          product?.extras.sort((a, b) => a.rank - b.rank).map(extra => extra.options?.sort((a, b) => a.rank - b.rank).map(option => {
+                          product?.extras?.sort((a, b) => a?.rank - b?.rank).map(extra => extra?.options?.sort((a, b) => a?.rank - b?.rank).map(option => {
                             return (
                               showOption(option) && (
                                 <Tab
@@ -643,7 +643,7 @@ const ProductOptionsUI = (props) => {
               )}
               <div>
                 {
-                  product?.extras?.sort((a, b) => a.rank - b.rank).map(extra => extra.options.sort((a, b) => a.rank - b.rank).map(option => {
+                  product?.extras?.sort((a, b) => a?.rank - b?.rank).map(extra => extra?.options?.sort((a, b) => a?.rank - b?.rank).map(option => {
                     const currentState = productCart.options[`id:${option?.id}`] || {}
                     return (
                       <React.Fragment key={option?.id}>

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

@@ -32,7 +32,8 @@ const UpsellingPageUI = (props) => {
     canOpenUpselling,
     setCanOpenUpselling,
     business,
-    isCustomMode
+    isCustomMode,
+    businessId
   } = props
 
   const [, t] = useLanguage()
@@ -61,7 +62,7 @@ const UpsellingPageUI = (props) => {
   }, [upsellingProducts?.products.length])
 
   const handleFormProduct = (product) => {
-    setActualProduct(product)
+    setActualProduct({ ...product, api: { ...product?.api, businessId } })
     setModalIsOpen(true)
   }
 
@@ -210,7 +211,7 @@ const UpsellingPageUI = (props) => {
           <ProductForm
             useKioskApp={props.useKioskApp}
             product={actualProduct}
-            businessId={actualProduct.api.businessId}
+            businessId={actualProduct?.api?.businessId}
             businessSlug={business.slug}
             onSave={() => handleSaveProduct()}
           />
@@ -221,9 +222,12 @@ const UpsellingPageUI = (props) => {
 }
 
 export const UpsellingPage = (props) => {
+  const useSuggestiveUpselling = JSON.parse(window.localStorage.getItem('suggestive-upselling')) ?? false
+
   const UpsellingPageProps = {
     ...props,
-    UIComponent: UpsellingPageUI
+    UIComponent: UpsellingPageUI,
+    useSuggestiveUpselling
   }
 
   return <UpsellingPageController {...UpsellingPageProps} />