ordering-components-external 13.2.20 → 13.2.22

package/_modules/components/AddressForm/index.js

@@ -193,7 +193,7 @@ var AddressForm = exports.AddressForm = function AddressForm(props) {
   var saveAddress = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(values, userCustomerSetup) {
       var _userByToken$session;
-      var _values$country_code, _formState$changes, _addressState$address, _userByToken$session2, _yield$ordering$users2, content, _content$result;
+      var _values$country_code, _formState$changes, _addressState$address, _userByToken$session2, data, _yield$ordering$users2, content, _content$result;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -218,57 +218,71 @@ var AddressForm = exports.AddressForm = function AddressForm(props) {
               loading: true
             }));
             _context2.prev = 8;
-            _context2.next = 11;
-            return ordering.users((userByToken === null || userByToken === void 0 ? void 0 : userByToken.id) || userId).addresses((_addressState$address = addressState.address) === null || _addressState$address === void 0 ? void 0 : _addressState$address.id).save(_objectSpread(_objectSpread({}, values), formState.changes), {
+            data = _objectSpread(_objectSpread({}, values), formState.changes);
+            Object.keys(data).forEach(function (key) {
+              if (data[key] === null) {
+                delete data[key];
+              }
+            });
+            _context2.next = 13;
+            return ordering.users((userByToken === null || userByToken === void 0 ? void 0 : userByToken.id) || userId).addresses((_addressState$address = addressState.address) === null || _addressState$address === void 0 ? void 0 : _addressState$address.id).save(data, {
               accessToken: (userByToken === null || userByToken === void 0 || (_userByToken$session2 = userByToken.session) === null || _userByToken$session2 === void 0 ? void 0 : _userByToken$session2.token) || accessToken
             });
-          case 11:
+          case 13:
             _yield$ordering$users2 = _context2.sent;
             content = _yield$ordering$users2.content;
             setFormState(_objectSpread(_objectSpread({}, formState), {}, {
               loading: false,
               error: content.error ? content.result : null,
+              result: content.result,
               changes: content.error ? formState.changes : {}
             }));
-            if (!content.error) {
-              setAddressState(_objectSpread(_objectSpread({}, addressState), {}, {
-                address: content.result
-              }));
-              onSaveAddress && onSaveAddress(content.result);
-              if (isSelectedAfterAdd) {
-                changeAddress(content.result.id, {
-                  address: isEdit ? null : content.result,
-                  country_code: (_content$result = content.result) === null || _content$result === void 0 ? void 0 : _content$result.country_code,
-                  type: options === null || options === void 0 ? void 0 : options.type,
-                  isEdit: isEdit
-                });
-              }
+            if (content.error) {
+              _context2.next = 22;
+              break;
             }
+            setAddressState(_objectSpread(_objectSpread({}, addressState), {}, {
+              address: content.result
+            }));
+            if (!isSelectedAfterAdd) {
+              _context2.next = 21;
+              break;
+            }
+            _context2.next = 21;
+            return changeAddress(content.result.id, {
+              address: isEdit ? null : content.result,
+              country_code: (_content$result = content.result) === null || _content$result === void 0 ? void 0 : _content$result.country_code,
+              type: options === null || options === void 0 ? void 0 : options.type,
+              isEdit: isEdit
+            });
+          case 21:
+            onSaveAddress && onSaveAddress(content.result);
+          case 22:
             if (!userCustomerSetup) {
-              _context2.next = 18;
+              _context2.next = 25;
               break;
             }
-            _context2.next = 18;
+            _context2.next = 25;
             return setUserCustomer(userCustomerSetup, true);
-          case 18:
+          case 25:
             if (!avoidRefreshUserInfo) {
               refreshUserInfo();
             }
-            _context2.next = 24;
+            _context2.next = 31;
             break;
-          case 21:
-            _context2.prev = 21;
+          case 28:
+            _context2.prev = 28;
             _context2.t0 = _context2["catch"](8);
             setFormState(_objectSpread(_objectSpread({}, formState), {}, {
               loading: false,
               error: [_context2.t0.message],
               address: {}
             }));
-          case 24:
+          case 31:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[8, 21]]);
+      }, _callee2, null, [[8, 28]]);
     }));
     return function saveAddress(_x3, _x4) {
       return _ref2.apply(this, arguments);

package/_modules/components/BusinessAndProductList/index.js

@@ -365,7 +365,13 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
               categoryState.products = productsFiltered || [];
             } else if (categorySelected.id === 'featured') {
               _productsFiltered = businessState === null || businessState === void 0 || (_businessState$busine8 = businessState.business) === null || _businessState$busine8 === void 0 || (_businessState$busine8 = _businessState$busine8.categories) === null || _businessState$busine8 === void 0 ? void 0 : _businessState$busine8.reduce(function (products, category) {
-                return [].concat(_toConsumableArray(products), _toConsumableArray(category.products));
+                return [].concat(_toConsumableArray(products), _toConsumableArray(category.products.map(function (product) {
+                  return _objectSpread(_objectSpread({}, product), category.slug ? {
+                    category: _objectSpread(_objectSpread({}, product === null || product === void 0 ? void 0 : product.category), {}, {
+                      slug: category.slug
+                    })
+                  } : {});
+                })));
               }, []).filter(function (product) {
                 return isFeaturedSearch(product);
               });
@@ -381,7 +387,13 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
               }
               productsToFilter = avoidProductDuplicate ? _categoriesCustom : businessState === null || businessState === void 0 || (_businessState$busine10 = businessState.business) === null || _businessState$busine10 === void 0 ? void 0 : _businessState$busine10.categories;
               _productsFiltered2 = productsToFilter === null || productsToFilter === void 0 ? void 0 : productsToFilter.reduce(function (products, category) {
-                return [].concat(_toConsumableArray(products), _toConsumableArray(category.products));
+                return [].concat(_toConsumableArray(products), _toConsumableArray(category.products.map(function (product) {
+                  return _objectSpread(_objectSpread({}, product), category.slug ? {
+                    category: _objectSpread(_objectSpread({}, product === null || product === void 0 ? void 0 : product.category), {}, {
+                      slug: category.slug
+                    })
+                  } : {});
+                })));
               }, []).filter(function (product) {
                 return isMatchSearch(product.name, product.description, product === null || product === void 0 ? void 0 : product.price);
               });
@@ -668,7 +680,14 @@ var BusinessAndProductList = exports.BusinessAndProductList = function BusinessA
             }
             if (!(categorySelected.id && categorySelected.id !== 'featured')) {
               productsList = searchValue ? _toConsumableArray(result) : (_ref9 = []).concat.apply(_ref9, _toConsumableArray(result.map(function (category) {
-                return category === null || category === void 0 ? void 0 : category.products;
+                var _category$products2;
+                return category === null || category === void 0 || (_category$products2 = category.products) === null || _category$products2 === void 0 ? void 0 : _category$products2.map(function (product) {
+                  return _objectSpread(_objectSpread({}, product), category !== null && category !== void 0 && category.slug ? {
+                    category: _objectSpread(_objectSpread({}, product.category), {}, {
+                      slug: category.slug
+                    })
+                  } : {});
+                });
               }))).filter(function (item) {
                 return item;
               });

package/_modules/components/OrderDetails/index.js

@@ -569,7 +569,7 @@ var OrderDetails = exports.OrderDetails = function OrderDetails(props) {
    */
   var getOrder = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-      var source, options, _result, result, error, response, res, _yield$ordering$setAc7, content, order, err, businessData, _err, _yield$ordering$setAc8, _content, _e$message, _order$id, _e$message2;
+      var source, options, _result, result, error, response, res, _yield$ordering$setAc7, content, order, err, businessData, _yield$ordering$setAc8, _content, _e$message, _order$id, _e$message2;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -631,7 +631,7 @@ var OrderDetails = exports.OrderDetails = function OrderDetails(props) {
             }
             setOrderState(_objectSpread(_objectSpread({}, orderState), {}, {
               loading: false,
-              error: [(_err = err) !== null && _err !== void 0 ? _err : 'ERROR']
+              error: [err !== null && err !== void 0 ? err : 'ERROR']
             }));
             return _context7.abrupt("return");
           case 30:

package/package.json

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

package/src/components/AddressForm/index.js

@@ -127,14 +127,22 @@ export const AddressForm = (props) => {
 
     setFormState({ ...formState, loading: true })
     try {
+      const data = { ...values, ...formState.changes }
+      Object.keys(data).forEach(key => {
+        if (data[key] === null) {
+          delete data[key]
+        }
+      })
+
       const { content } = await ordering
         .users(userByToken?.id || userId)
         .addresses(addressState.address?.id)
-        .save({ ...values, ...formState.changes }, { accessToken: userByToken?.session?.token || accessToken })
+        .save(data, { accessToken: userByToken?.session?.token || accessToken })
       setFormState({
         ...formState,
         loading: false,
         error: content.error ? content.result : null,
+        result: content.result,
         changes: content.error ? formState.changes : {}
       })
       if (!content.error) {
@@ -142,15 +150,15 @@ export const AddressForm = (props) => {
           ...addressState,
           address: content.result
         })
-        onSaveAddress && onSaveAddress(content.result)
         if (isSelectedAfterAdd) {
-          changeAddress(content.result.id, {
+          await changeAddress(content.result.id, {
             address: isEdit ? null : content.result,
             country_code: content.result?.country_code,
             type: options?.type,
             isEdit
           })
         }
+        onSaveAddress && onSaveAddress(content.result)
       }
       if (userCustomerSetup) {
         await setUserCustomer(userCustomerSetup, true)

package/src/components/BusinessAndProductList/index.js

@@ -269,7 +269,13 @@ export const BusinessAndProductList = (props) => {
       categoryState.products = productsFiltered || []
     } else if (categorySelected.id === 'featured') {
       const productsFiltered = businessState?.business?.categories?.reduce(
-        (products, category) => [...products, ...category.products], []
+        (products, category) => [
+          ...products,
+          ...category.products.map(product => ({
+            ...product,
+            ...(category.slug ? { category: { ...product?.category, slug: category.slug } } : {})
+          }))
+        ], []
       ).filter(
         product => isFeaturedSearch(product)
       )
@@ -283,7 +289,13 @@ export const BusinessAndProductList = (props) => {
 
       const productsToFilter = avoidProductDuplicate ? _categoriesCustom : businessState?.business?.categories
       const productsFiltered = productsToFilter?.reduce(
-        (products, category) => [...products, ...category.products], []
+        (products, category) => [
+          ...products,
+          ...category.products.map(product => ({
+            ...product,
+            ...(category.slug ? { category: { ...product?.category, slug: category.slug } } : {})
+          }))
+        ], []
       ).filter(
         product => isMatchSearch(product.name, product.description, product?.price)
       )
@@ -496,7 +508,14 @@ export const BusinessAndProductList = (props) => {
       }
 
       if (!(categorySelected.id && categorySelected.id !== 'featured')) {
-        const productsList = searchValue ? [...result] : [].concat(...result.map(category => category?.products)).filter(item => item)
+        const productsList = searchValue
+          ? [...result]
+          : [].concat(...result.map(category =>
+              category?.products?.map(product => ({
+                ...product,
+                ...(category?.slug ? { category: { ...product.category, slug: category.slug } } : {})
+              }))
+          )).filter(item => item)
         const productsListFeatured = featuredRes?.content?.result ?? []
         const paginationData = categorySelected.id === 'featured'
           ? categoriesState?.featured?.pagination ?? {}