ordering-components-external 13.2.2 → 13.2.4

package/_modules/components/BusinessAndProductList/index.js

@@ -255,10 +255,10 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
     }));
   };
   var subCategoriesList = [];
-  var iterateCategories = function iterateCategories(categories) {
+  var _iterateCategories = function iterateCategories(categories) {
     return (categories === null || categories === void 0 ? void 0 : categories.length) > 0 && (categories === null || categories === void 0 ? void 0 : categories.forEach(function (category) {
       subCategoriesList.push(category);
-      iterateCategories(category.subcategories);
+      _iterateCategories(category.subcategories);
     }));
   };
 
@@ -343,7 +343,7 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
               loading: false
             });
             if (categorySelected.id !== 'featured' && categorySelected.id !== null) {
-              iterateCategories(businessState === null || businessState === void 0 || (_businessState$busine4 = businessState.business) === null || _businessState$busine4 === void 0 ? void 0 : _businessState$busine4.categories);
+              _iterateCategories(businessState === null || businessState === void 0 || (_businessState$busine4 = businessState.business) === null || _businessState$busine4 === void 0 ? void 0 : _businessState$busine4.categories);
               categoriesList = (_ref3 = []).concat.apply(_ref3, _toConsumableArray(businessState === null || businessState === void 0 || (_businessState$busine5 = businessState.business) === null || _businessState$busine5 === void 0 ? void 0 : _businessState$busine5.categories.map(function (category) {
                 return category.children;
               })));
@@ -865,7 +865,8 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
             requestsState.product = source;
             parameters = {
               type: ((_orderState$options5 = orderState.options) === null || _orderState$options5 === void 0 ? void 0 : _orderState$options5.type) || 1,
-              moment: ((_orderState$options6 = orderState.options) === null || _orderState$options6 === void 0 ? void 0 : _orderState$options6.moment) || null
+              moment: ((_orderState$options6 = orderState.options) === null || _orderState$options6 === void 0 ? void 0 : _orderState$options6.moment) || null,
+              version: 'v2'
             };
             if ((_orderState$options7 = orderState.options) !== null && _orderState$options7 !== void 0 && _orderState$options7.moment && isValidMoment((_orderState$options8 = orderState.options) === null || _orderState$options8 === void 0 ? void 0 : _orderState$options8.moment, 'YYYY-MM-DD HH:mm:ss')) {
               moment = _dayjs.default.utc((_orderState$options9 = orderState.options) === null || _orderState$options9 === void 0 ? void 0 : _orderState$options9.moment, 'YYYY-MM-DD HH:mm:ss').local().unix();
@@ -1031,14 +1032,14 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
       })
     }));
   };
-  var updateCategories = function updateCategories(categories, result) {
+  var _updateCategories = function updateCategories(categories, result) {
     return categories.map(function (category) {
       if (category.id === result.id) {
         return _objectSpread(_objectSpread({}, category), result);
       }
       if (Array.isArray(category === null || category === void 0 ? void 0 : category.subcategories) && category.subcategories.length > 0) {
         return _objectSpread(_objectSpread({}, category), {}, {
-          subcategories: updateCategories(category.subcategories, result)
+          subcategories: _updateCategories(category.subcategories, result)
         });
       }
       return category;
@@ -1120,7 +1121,7 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
             result = _yield$ordering$busin7.result;
             error = _yield$ordering$busin7.error;
             if (!error) {
-              updatedCategories = updateCategories(businessState === null || businessState === void 0 ? void 0 : businessState.business.categories, result);
+              updatedCategories = _updateCategories(businessState === null || businessState === void 0 ? void 0 : businessState.business.categories, result);
               updatedBusiness = _objectSpread(_objectSpread({}, businessState === null || businessState === void 0 ? void 0 : businessState.business), {}, {
                 categories: updatedCategories
               });

package/_modules/components/OrderListGroups/index.js

@@ -1380,7 +1380,7 @@ var OrderListGroups = exports.OrderListGroups = function OrderListGroups(props)
         var _order$payment_events, _ordersGroup, _getStatusById;
         if (!(order !== null && order !== void 0 && order.products) || !(order !== null && order !== void 0 && order.summary) || typeof (order === null || order === void 0 ? void 0 : order.status) !== 'number' || !(order !== null && order !== void 0 && order.customer) || !(order !== null && order !== void 0 && order.business) || !(order !== null && order !== void 0 && order.paymethod) && !(order !== null && order !== void 0 && (_order$payment_events = order.payment_events) !== null && _order$payment_events !== void 0 && _order$payment_events.some(function (e) {
           return e.event === 'payment';
-        }))) {
+        })) && (order === null || order === void 0 ? void 0 : order.total) !== 0) {
           return;
         }
         delete order.total;

package/_modules/components/OrdersDashboardComponents/BusinessProductsListing/index.js

@@ -696,7 +696,7 @@ var BusinessProductsListing = exports.BusinessProductsListing = function Busines
       isRemove = _ref8.isRemove,
       id = _ref8.id;
     var _categories = _toConsumableArray(businessState === null || businessState === void 0 || (_businessState$busine9 = businessState.business) === null || _businessState$busine9 === void 0 ? void 0 : _businessState$busine9.categories);
-    var replaceSameTaxes = function replaceSameTaxes(categories, tax) {
+    var _replaceSameTaxes = function replaceSameTaxes(categories, tax) {
       for (var i = 0; i < (categories === null || categories === void 0 ? void 0 : categories.length); i++) {
         var _category$subcategori2;
         var category = categories[i];
@@ -712,14 +712,14 @@ var BusinessProductsListing = exports.BusinessProductsListing = function Busines
           }
         }
         if (((_category$subcategori2 = category.subcategories) === null || _category$subcategori2 === void 0 ? void 0 : _category$subcategori2.length) > 0) {
-          categories.subcategories = replaceSameTaxes(categories.subcategories, tax);
+          categories.subcategories = _replaceSameTaxes(categories.subcategories, tax);
         }
       }
       return categories;
     };
     setBusinessState(_objectSpread(_objectSpread({}, businessState), {}, {
       business: _objectSpread(_objectSpread({}, businessState.business), {}, {
-        categories: replaceSameTaxes(_categories, tax)
+        categories: _replaceSameTaxes(_categories, tax)
       })
     }));
   };
@@ -728,7 +728,7 @@ var BusinessProductsListing = exports.BusinessProductsListing = function Busines
     var fee = _ref9.fee,
       isRemove = _ref9.isRemove;
     var _categories = _toConsumableArray(businessState === null || businessState === void 0 || (_businessState$busine10 = businessState.business) === null || _businessState$busine10 === void 0 ? void 0 : _businessState$busine10.categories);
-    var replaceSameFees = function replaceSameFees(categories, fee) {
+    var _replaceSameFees = function replaceSameFees(categories, fee) {
       for (var i = 0; i < (categories === null || categories === void 0 ? void 0 : categories.length); i++) {
         var _category$subcategori3;
         var category = categories[i];
@@ -744,14 +744,14 @@ var BusinessProductsListing = exports.BusinessProductsListing = function Busines
           }
         }
         if (((_category$subcategori3 = category.subcategories) === null || _category$subcategori3 === void 0 ? void 0 : _category$subcategori3.length) > 0) {
-          categories.subcategories = replaceSameFees(categories.subcategories, fee);
+          categories.subcategories = _replaceSameFees(categories.subcategories, fee);
         }
       }
       return categories;
     };
     setBusinessState(_objectSpread(_objectSpread({}, businessState), {}, {
       business: _objectSpread(_objectSpread({}, businessState.business), {}, {
-        categories: replaceSameFees(_categories, fee)
+        categories: _replaceSameFees(_categories, fee)
       })
     }));
   };

package/_modules/components/ProductForm/index.js

@@ -465,7 +465,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
    * @param {object} cart Current cart
    * @param {number} suboptionId Suboption id
    */
-  var removeRelatedOptions = function removeRelatedOptions(productCart, suboptionId) {
+  var _removeRelatedOptions = function removeRelatedOptions(productCart, suboptionId) {
     product.product.extras.forEach(function (_extra) {
       _extra.options.forEach(function (_option) {
         if (_option.respect_to === suboptionId) {
@@ -473,7 +473,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
           var suboptions = (_productCart$options2 = productCart.options["id:".concat(_option.id)]) === null || _productCart$options2 === void 0 ? void 0 : _productCart$options2.suboptions;
           if (suboptions) {
             Object.keys(suboptions).map(function (suboptionKey) {
-              return removeRelatedOptions(productCart, parseInt(suboptionKey.split(':')[1]));
+              return _removeRelatedOptions(productCart, parseInt(suboptionKey.split(':')[1]));
             });
           }
           if (productCart.options["id:".concat(_option.id)]) {
@@ -520,14 +520,14 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
     var newPizzaState = {};
     if (!state.selected) {
       delete newProductCart.options["id:".concat(option.id)].suboptions["id:".concat(suboption.id)];
-      removeRelatedOptions(newProductCart, suboption.id);
+      _removeRelatedOptions(newProductCart, suboption.id);
       newPizzaState = handleVerifyPizzaState(state, suboption, option);
     } else {
       if (option.min === option.max && option.min === 1) {
         var suboptions = newProductCart.options["id:".concat(option.id)].suboptions;
         if (suboptions) {
           Object.keys(suboptions).map(function (suboptionKey) {
-            return removeRelatedOptions(newProductCart, parseInt(suboptionKey.split(':')[1]));
+            return _removeRelatedOptions(newProductCart, parseInt(suboptionKey.split(':')[1]));
           });
         }
         if (newProductCart.options["id:".concat(option.id)]) {
@@ -628,7 +628,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
               try {
                 for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
                   var _suboption2 = _step8.value;
-                  if (checkSuboptionsSelected(_suboption2 === null || _suboption2 === void 0 ? void 0 : _suboption2.id, _selectedSuboptions, dependsSuboptions)) {
+                  if (_checkSuboptionsSelected(_suboption2 === null || _suboption2 === void 0 ? void 0 : _suboption2.id, _selectedSuboptions, dependsSuboptions)) {
                     preselectedOptions.push(_option4);
                     preselectedSuboptions.push(_suboption2);
                   }
@@ -715,13 +715,13 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
       }
       if (!(state !== null && state !== void 0 && state.selected)) {
         delete newProductCart.options["id:".concat(option.id)].suboptions["id:".concat(suboption.id)];
-        removeRelatedOptions(newProductCart, suboption.id);
+        _removeRelatedOptions(newProductCart, suboption.id);
       } else {
         if (option.min === option.max && option.min === 1) {
           var suboptions = newProductCart.options["id:".concat(option.id)].suboptions;
           if (suboptions) {
             Object.keys(suboptions).map(function (suboptionKey) {
-              return removeRelatedOptions(newProductCart, parseInt(suboptionKey.split(':')[1]));
+              return _removeRelatedOptions(newProductCart, parseInt(suboptionKey.split(':')[1]));
             });
           }
           if (newProductCart.options["id:".concat(option.id)]) {
@@ -1123,7 +1123,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
    * Check if there is an option required with one suboption
   */
 
-  var checkSuboptionsSelected = function checkSuboptionsSelected(suboptionId, _selectedSuboptions, _dependsSuboptions) {
+  var _checkSuboptionsSelected = function checkSuboptionsSelected(suboptionId, _selectedSuboptions, _dependsSuboptions) {
     var _dependsSuboptions2;
     var count = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
     if (count > 100) {
@@ -1136,7 +1136,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
     if (respectTo === null) {
       return _selectedSuboptions["suboption:".concat(suboptionId)];
     }
-    return checkSuboptionsSelected(respectTo, _selectedSuboptions, _dependsSuboptions, count++);
+    return _checkSuboptionsSelected(respectTo, _selectedSuboptions, _dependsSuboptions, count++);
   };
   (0, _react.useEffect)(function () {
     var _product$product11;
@@ -1205,7 +1205,7 @@ var ProductForm = exports.ProductForm = function ProductForm(props) {
               try {
                 for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
                   var _suboption3 = _step14.value;
-                  if (checkSuboptionsSelected(_suboption3 === null || _suboption3 === void 0 ? void 0 : _suboption3.id, _selectedSuboptions, _dependsSuboptions)) {
+                  if (_checkSuboptionsSelected(_suboption3 === null || _suboption3 === void 0 ? void 0 : _suboption3.id, _selectedSuboptions, _dependsSuboptions)) {
                     preselectedOptions.push(_option5);
                     preselectedSuboptions.push(_suboption3);
                   }

package/_modules/components/ProductItemAccordion/index.js

@@ -31,7 +31,7 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
   /**
    * Run productInfo to sort product options
    */
-  var productInfo = function productInfo() {
+  var _productInfo = function productInfo() {
     var _product$options;
     var options = JSON.parse(JSON.stringify(Object.values((_product$options = product.options) !== null && _product$options !== void 0 ? _product$options : {})));
     var extraGroups = options.reduce(function (acc, option) {
@@ -69,7 +69,7 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
         option.suboptions = Object.values((_option$suboptions = option.suboptions) !== null && _option$suboptions !== void 0 ? _option$suboptions : {});
         return option;
       });
-      return _objectSpread(_objectSpread({}, productInfo), {}, {
+      return _objectSpread(_objectSpread({}, _productInfo), {}, {
         ingredients: ingredients,
         options: options
       });
@@ -79,7 +79,7 @@ var ProductItemAccordion = exports.ProductItemAccordion = function ProductItemAc
     });
   };
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, UIComponent && /*#__PURE__*/_react.default.createElement(UIComponent, _extends({}, props, {
-    productInfo: productInfo()
+    productInfo: _productInfo()
   })));
 };
 ProductItemAccordion.propTypes = {

package/_modules/components/StoreProductList/index.js

@@ -222,14 +222,14 @@ var StoreProductList = exports.StoreProductList = function StoreProductList(prop
       return _ref2.apply(this, arguments);
     };
   }();
-  var updateCategories = function updateCategories(categories, result) {
+  var _updateCategories = function updateCategories(categories, result) {
     return categories.map(function (category) {
       if (category.id === result.id) {
         return _objectSpread(_objectSpread({}, category), result);
       }
       if (Array.isArray(category === null || category === void 0 ? void 0 : category.subcategories) && category.subcategories.length > 0) {
         return _objectSpread(_objectSpread({}, category), {}, {
-          subcategories: updateCategories(category.subcategories, result)
+          subcategories: _updateCategories(category.subcategories, result)
         });
       }
       return category;
@@ -311,7 +311,7 @@ var StoreProductList = exports.StoreProductList = function StoreProductList(prop
             result = _yield$ordering$busin4.result;
             error = _yield$ordering$busin4.error;
             if (!error) {
-              updatedCategories = updateCategories(businessState === null || businessState === void 0 ? void 0 : businessState.business.categories, result);
+              updatedCategories = _updateCategories(businessState === null || businessState === void 0 ? void 0 : businessState.business.categories, result);
               updatedBusiness = _objectSpread(_objectSpread({}, businessState === null || businessState === void 0 ? void 0 : businessState.business), {}, {
                 categories: updatedCategories
               });
@@ -338,13 +338,13 @@ var StoreProductList = exports.StoreProductList = function StoreProductList(prop
       return _ref4.apply(this, arguments);
     };
   }();
-  var validCategory = function validCategory(cat, searchVal) {
+  var _validCategory = function validCategory(cat, searchVal) {
     var _cat$subcategories, _cat$name, _cat$subcategories2;
     if ((cat === null || cat === void 0 || (_cat$subcategories = cat.subcategories) === null || _cat$subcategories === void 0 ? void 0 : _cat$subcategories.length) === 0) return;
     if (cat !== null && cat !== void 0 && (_cat$name = cat.name) !== null && _cat$name !== void 0 && _cat$name.toLowerCase().includes(searchVal)) return true;
     var subcategories = cat === null || cat === void 0 || (_cat$subcategories2 = cat.subcategories) === null || _cat$subcategories2 === void 0 ? void 0 : _cat$subcategories2.filter(function (subCat) {
       var _subCat$name;
-      return (subCat === null || subCat === void 0 || (_subCat$name = subCat.name) === null || _subCat$name === void 0 || (_subCat$name = _subCat$name.toLowerCase()) === null || _subCat$name === void 0 ? void 0 : _subCat$name.includes(searchVal)) || validCategory(subCat, searchVal);
+      return (subCat === null || subCat === void 0 || (_subCat$name = subCat.name) === null || _subCat$name === void 0 || (_subCat$name = _subCat$name.toLowerCase()) === null || _subCat$name === void 0 ? void 0 : _subCat$name.includes(searchVal)) || _validCategory(subCat, searchVal);
     });
     return (subcategories === null || subcategories === void 0 ? void 0 : subcategories.length) > 0;
   };
@@ -359,12 +359,12 @@ var StoreProductList = exports.StoreProductList = function StoreProductList(prop
     if ((businessState === null || businessState === void 0 || (_businessState$busine5 = businessState.business) === null || _businessState$busine5 === void 0 || (_businessState$busine5 = _businessState$busine5.categories) === null || _businessState$busine5 === void 0 ? void 0 : _businessState$busine5.length) > 0) {
       var _businessState$busine6;
       var lowerCaseSearchVal = categorySearch.toLowerCase();
-      var _updateCategories = businessState === null || businessState === void 0 || (_businessState$busine6 = businessState.business) === null || _businessState$busine6 === void 0 || (_businessState$busine6 = _businessState$busine6.categories) === null || _businessState$busine6 === void 0 ? void 0 : _businessState$busine6.filter(function (cat) {
+      var updateCategories = businessState === null || businessState === void 0 || (_businessState$busine6 = businessState.business) === null || _businessState$busine6 === void 0 || (_businessState$busine6 = _businessState$busine6.categories) === null || _businessState$busine6 === void 0 ? void 0 : _businessState$busine6.filter(function (cat) {
         var _cat$name2;
         if (cat !== null && cat !== void 0 && (_cat$name2 = cat.name) !== null && _cat$name2 !== void 0 && (_cat$name2 = _cat$name2.toLowerCase()) !== null && _cat$name2 !== void 0 && _cat$name2.includes(lowerCaseSearchVal)) return true;
-        return validCategory(cat, lowerCaseSearchVal);
+        return _validCategory(cat, lowerCaseSearchVal);
       });
-      setCategories(_updateCategories);
+      setCategories(updateCategories);
     }
   }, [categorySearch, businessState === null || businessState === void 0 ? void 0 : businessState.business]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, UIComponent && /*#__PURE__*/_react.default.createElement(UIComponent, _extends({}, props, {

package/_modules/utils/index.js

@@ -15,7 +15,7 @@ var randomString = exports.randomString = function randomString() {
   }
   return result;
 };
-var deepEqual = exports.deepEqual = function deepEqual(object1, object2) {
+var _deepEqual = exports.deepEqual = function deepEqual(object1, object2) {
   var keys1 = Object.keys(object1);
   var keys2 = Object.keys(object2);
   if (keys1.length !== keys2.length) {
@@ -26,7 +26,7 @@ var deepEqual = exports.deepEqual = function deepEqual(object1, object2) {
     var val1 = object1[key];
     var val2 = object2[key];
     var areObjects = isObject(val1) && isObject(val2);
-    if (areObjects && !deepEqual(val1, val2) || !areObjects && val1 !== val2) {
+    if (areObjects && !_deepEqual(val1, val2) || !areObjects && val1 !== val2) {
       return false;
     }
   }

package/package.json

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

package/src/components/BusinessAndProductList/index.js

@@ -657,7 +657,8 @@ export const BusinessAndProductList = (props) => {
         requestsState.product = source
         const parameters = {
           type: orderState.options?.type || 1,
-          moment: orderState.options?.moment || null
+          moment: orderState.options?.moment || null,
+          version: 'v2'
         }
 
         if (orderState.options?.moment && isValidMoment(orderState.options?.moment, 'YYYY-MM-DD HH:mm:ss')) {
@@ -786,21 +787,21 @@ export const BusinessAndProductList = (props) => {
         return {
           ...category,
           ...result
-        };
+        }
       }
       if (Array.isArray(category?.subcategories) && category.subcategories.length > 0) {
         return {
           ...category,
-          subcategories: updateCategories(category.subcategories, result),
-        };
+          subcategories: updateCategories(category.subcategories, result)
+        }
       }
-      return category;
-    });
-  };
+      return category
+    })
+  }
 
   const updateStoreProduct = async (categoryId, productId, updateParams = {}) => {
     try {
-      const { content: { result, error } } = await ordering.businesses(businessState?.business?.id).categories(categoryId).products(productId).save(updateParams);
+      const { content: { result, error } } = await ordering.businesses(businessState?.business?.id).categories(categoryId).products(productId).save(updateParams)
 
       if (!error) {
         const updatedProducts = categoryState.products.map(product => {
@@ -829,7 +830,7 @@ export const BusinessAndProductList = (props) => {
       const { content: { result, error } } = await ordering.businesses(businessState?.business?.id).categories(categoryId).save(updateParams)
 
       if (!error) {
-        const updatedCategories = updateCategories(businessState?.business.categories, result);
+        const updatedCategories = updateCategories(businessState?.business.categories, result)
         const updatedBusiness = { ...businessState?.business, categories: updatedCategories }
         setBusinessState({ ...businessState, business: updatedBusiness })
         showToast(ToastType.Success, result?.enabled

package/src/components/OrderListGroups/index.js

@@ -959,7 +959,7 @@ export const OrderListGroups = (props) => {
           typeof order?.status !== 'number' ||
           !order?.customer ||
           !order?.business ||
-          (!order?.paymethod && !order?.payment_events?.some(e => e.event === 'payment'))
+          ((!order?.paymethod && !order?.payment_events?.some(e => e.event === 'payment')) && order?.total !== 0)
         ) {
           return
         }