ordering-ui-admin-external 1.33.1 → 1.35.0

package/_modules/components/Stores/BusinessPaymentMethods/index.js

@@ -24,6 +24,7 @@ var _PaymentOptionPaypal = require("../PaymentOptionPaypal");
 var _PaymentOptionSquare = require("../PaymentOptionSquare");
 var _PaymentOptionMethods = require("../PaymentOptionMethods");
 var _BusinessWalletsList = require("../BusinessWalletsList");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -72,7 +73,6 @@ var BusinessPaymentMethodsUI = function BusinessPaymentMethodsUI(props) {
     handleSuccessUpdate = props.handleSuccessUpdate,
     isTutorialMode = props.isTutorialMode,
     handleTutorialContinue = props.handleTutorialContinue;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -125,6 +125,12 @@ var BusinessPaymentMethodsUI = function BusinessPaymentMethodsUI(props) {
   }, {
     value: 5,
     text: t('DRIVER_THRU', 'Driver thru')
+  }, {
+    value: 7,
+    text: t('CATERING_DELIVERY', 'Catering delivery')
+  }, {
+    value: 8,
+    text: t('CATERING_PICKUP', 'Catering pickup')
   }];
   var methodsPay = ['google_pay', 'apple_pay'];
   var closeAlert = function closeAlert() {
@@ -163,9 +169,9 @@ var BusinessPaymentMethodsUI = function BusinessPaymentMethodsUI(props) {
       setIsExtendExtraOpen(true);
     }
     if (!isInitialRender) {
-      var businessId = query.get('id');
-      var section = query.get('section');
-      history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&paymethod=").concat(paymethodId));
+      (0, _utils.addQueryToUrl)({
+        paymethod: paymethodId
+      });
     }
   };
   var handleClickCheckBox = function handleClickCheckBox(id) {
@@ -189,9 +195,7 @@ var BusinessPaymentMethodsUI = function BusinessPaymentMethodsUI(props) {
     setIsEdit(false);
     setSelectedBusinessPaymethod(null);
     setIsSuccessDeleted(false);
-    var businessId = query.get('id');
-    var section = query.get('section');
-    history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section));
+    (0, _utils.removeQueryToUrl)(['paymethod']);
   };
   (0, _react.useEffect)(function () {
     if (!isSuccessDeleted) return;

package/_modules/components/Stores/BusinessPlaceGroupList/index.js

@@ -14,6 +14,7 @@ var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 var _BusinessPlaceGroup = require("../BusinessPlaceGroup");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -44,7 +45,6 @@ var BusinessPlaceGroupListUI = function BusinessPlaceGroupListUI(props) {
     handleChangeEnabled = props.handleChangeEnabled,
     handleMultiChangeEnabled = props.handleMultiChangeEnabled,
     getMultiCheckStatus = props.getMultiCheckStatus;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -68,9 +68,7 @@ var BusinessPlaceGroupListUI = function BusinessPlaceGroupListUI(props) {
     setOpenDetail(false);
     setSelectedPlace(null);
     setIsExtendExtraOpen(false);
-    var businessId = query.get('id');
-    var section = query.get('section');
-    history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section));
+    (0, _utils.removeQueryToUrl)(['place_group']);
   };
   var handleUpdateSelectedPlaceGroup = function handleUpdateSelectedPlaceGroup(placeGroup) {
     setSelectedPlace(placeGroup);
@@ -80,9 +78,9 @@ var BusinessPlaceGroupListUI = function BusinessPlaceGroupListUI(props) {
     if (e !== null && e !== void 0 && (_e$target = e.target) !== null && _e$target !== void 0 && _e$target.closest('.check-box')) return;
     handleOpenDetail(placeGroup);
     if (!isInitialRender) {
-      var businessId = query.get('id');
-      var section = query.get('section');
-      history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&place_group=").concat(placeGroup.id));
+      (0, _utils.addQueryToUrl)({
+        place_group: placeGroup.id
+      });
     }
   };
   var handleCheckBoxChange = function handleCheckBoxChange(placeGroup) {

package/_modules/components/Stores/BusinessPreorderDetails/index.js

@@ -125,6 +125,18 @@ var BusinessPreorderDetails = function BusinessPreorderDetails(props) {
     color: "primary",
     disabled: formState.loading || Object.keys(formState.changes).length === 0,
     onClick: handleUpdateBusinessClick
-  }, t('SAVE', 'Save'))));
+  }, t('SAVE', 'Save'))), /*#__PURE__*/_react.default.createElement(_styles3.Divider, null), /*#__PURE__*/_react.default.createElement(_BusinessCateringDelivery.BusinessCateringDelivery, {
+    minutes: minutes,
+    type: "catering_delivery",
+    business: business,
+    changePreorderConfigs: changePreorderConfigs,
+    disabled: actionStatus === null || actionStatus === void 0 ? void 0 : actionStatus.loading
+  }), /*#__PURE__*/_react.default.createElement(_BusinessCateringDelivery.BusinessCateringDelivery, {
+    minutes: minutes,
+    type: "catering_pickup",
+    business: business,
+    changePreorderConfigs: changePreorderConfigs,
+    disabled: actionStatus === null || actionStatus === void 0 ? void 0 : actionStatus.loading
+  }), /*#__PURE__*/_react.default.createElement(_styles2.Margin, null));
 };
 exports.BusinessPreorderDetails = BusinessPreorderDetails;

package/_modules/components/Stores/BusinessProductList/index.js

@@ -167,7 +167,7 @@ var BusinessProductList = function BusinessProductList(props) {
     return a.rank - b.rank;
   }).map(function (product, i) {
     return /*#__PURE__*/_react.default.createElement(_SingleBusinessProduct.SingleBusinessProduct, _extends({}, props, {
-      key: i,
+      key: "".concat(product === null || product === void 0 ? void 0 : product.id, "_").concat(i),
       productDetailsId: productDetailsId,
       product: product,
       allowColumns: allowColumns,

package/_modules/components/Stores/BusinessProductsCategoyDetails/index.js

@@ -16,6 +16,7 @@ var _Shared = require("../../Shared");
 var _styles = require("../../../styles");
 var _SeoOptions = require("../SeoOptions");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
+var _utils = require("../../../utils");
 var _BusinessCategoryInfoSettingList = require("../BusinessCategoryInfoSettingList");
 var _BusinessProductsCategoyInfo = require("../BusinessProductsCategoyInfo");
 var _styles2 = require("./styles");
@@ -50,7 +51,6 @@ var BusinessProductsCategoyDetailsUI = function BusinessProductsCategoyDetailsUI
     handleChangeRibbon = props.handleChangeRibbon,
     isTutorialMode = props.isTutorialMode,
     handleTutorialSkip = props.handleTutorialSkip;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -120,8 +120,9 @@ var BusinessProductsCategoyDetailsUI = function BusinessProductsCategoyDetailsUI
   var handleTabClick = function handleTabClick(tab, isInitialRender) {
     setSelctedInfoItem(tab);
     if (!isInitialRender) {
-      var _category = query.get('category');
-      history.replace("".concat(location.pathname, "?category=").concat(_category, "&tab=").concat(tab));
+      (0, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

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

@@ -31,8 +31,8 @@ var _ImportersButton = require("../ImportersButton");
 var _AddBusinessForm = require("../AddBusinessForm");
 var _ProductStep = require("../ProductStep");
 var _BusinessAddStore = require("../BusinessAddStore");
-var _styles2 = require("./styles");
 var _utils = require("../../../utils");
+var _styles2 = require("./styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -79,7 +79,6 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
     categoryState = props.categoryState,
     handleUpdateCategoryState = props.handleUpdateCategoryState,
     siteState = props.siteState;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -172,7 +171,9 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
       setCategorySelected(category);
       setOpenSidebar('category_details');
       if (!isInitialRender) {
-        history.replace("".concat(location.pathname, "?category=").concat(category.id));
+        (0, _utils.addQueryToUrl)({
+          category: category.id
+        });
       }
     } else {
       setCurrentCategory(null);
@@ -187,7 +188,7 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
     });
     setCurrentCategory(null);
     setOpenSidebar(null);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['category']);
   };
   var handleOpenProductDetails = function handleOpenProductDetails(product, isInitialRender) {
     setSelectedProduct(product);
@@ -336,7 +337,9 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
     className: "business",
     onClick: function onClick() {
       var _businessState$busine15;
-      history.replace("".concat(location.pathname, "?id=").concat(businessState === null || businessState === void 0 || (_businessState$busine15 = businessState.business) === null || _businessState$busine15 === void 0 ? void 0 : _businessState$busine15.id));
+      (0, _utils.addQueryToUrl)({
+        id: businessState === null || businessState === void 0 || (_businessState$busine15 = businessState.business) === null || _businessState$busine15 === void 0 ? void 0 : _businessState$busine15.id
+      });
       setOpenSidebar('business_details');
     }
   }, (selectedBusiness === null || selectedBusiness === void 0 ? void 0 : selectedBusiness.name) || (businessState === null || businessState === void 0 || (_businessState$busine16 = businessState.business) === null || _businessState$busine16 === void 0 ? void 0 : _businessState$busine16.name)), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ChevronRight, null), /*#__PURE__*/_react.default.createElement("span", null, categorySelected === null || categorySelected === void 0 ? void 0 : categorySelected.name))))), slug && /*#__PURE__*/_react.default.createElement(_styles2.ActionsGroup, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
@@ -473,7 +476,8 @@ var BusinessProductsListingUI = function BusinessProductsListingUI(props) {
     // handleSucessUpdateBusiness={handleSucessUpdateBusiness}
     ,
     onClose: function onClose() {
-      return setOpenSidebar(null);
+      setOpenSidebar(null);
+      (0, _utils.removeQueryToUrl)(['id']);
     },
     businessTypes: businessTypes,
     setBusinessTypes: setBusinessTypes

package/_modules/components/Stores/BusinessSharedMenuProducts/index.js

@@ -13,6 +13,7 @@ var _Shared = require("../../Shared");
 var _BusinessSharedMenuProductDetails = require("../BusinessSharedMenuProductDetails");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -33,7 +34,6 @@ var BusinessSharedMenuProductsUI = function BusinessSharedMenuProductsUI(props)
     handleUpdateBusinessSharedMenuProduct = props.handleUpdateBusinessSharedMenuProduct,
     setIsOpenSharedProduct = props.setIsOpenSharedProduct,
     handleChangeInput = props.handleChangeInput;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -60,22 +60,16 @@ var BusinessSharedMenuProductsUI = function BusinessSharedMenuProductsUI(props)
     setCurrentProduct(product);
     setIsOpenDetails(true);
     if (!isInitialRender) {
-      var businessId = query.get('id');
-      var section = query.get('section');
-      var tab = query.get('tab');
-      var menu = query.get('menu');
-      history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&tab=").concat(tab, "&menu=").concat(menu, "&product=").concat(product.id));
+      (0, _utils.addQueryToUrl)({
+        product: product.id
+      });
     }
   };
   var handleCloseSidebar = function handleCloseSidebar() {
     setIsOpenDetails(false);
     setCurrentProduct(null);
     setIsOpenSharedProduct(false);
-    var businessId = query.get('id');
-    var section = query.get('section');
-    var tab = query.get('tab');
-    var menu = query.get('menu');
-    history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&tab=").concat(tab, "&menu=").concat(menu));
+    (0, _utils.removeQueryToUrl)(['product']);
   };
   (0, _react.useEffect)(function () {
     var productId = query.get('product');

package/_modules/components/Stores/BusinessSync/index.js

@@ -11,6 +11,7 @@ var _orderingComponentsAdminExternal = require("ordering-components-admin-extern
 var _BusinessSyncBasic = require("../BusinessSyncBasic");
 var _BusinessSyncItsaCheckmate = require("../BusinessSyncItsaCheckmate");
 var _BusinessSyncStore = require("../BusinessSyncStore");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -22,7 +23,6 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var BusinessSync = function BusinessSync(props) {
   var handleParentSidebarMove = props.handleParentSidebarMove;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -42,8 +42,9 @@ var BusinessSync = function BusinessSync(props) {
     handleParentSidebarMove(0);
     setSelectedOption(key);
     if (!isInitialRender) {
-      var header = query.get('header');
-      history.replace("".concat(location.pathname, "?header=").concat(header, "&tab=").concat(key));
+      (0, _utils.addQueryToUrl)({
+        tab: key
+      });
     }
   };
   (0, _react.useEffect)(function () {

package/_modules/components/Stores/BusinessTypes/index.js

@@ -12,6 +12,7 @@ var _Shared = require("../../Shared");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 var _BsCardImage = _interopRequireDefault(require("@meronex/icons/bs/BsCardImage"));
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 var _BusinessTypeDetail = require("../BusinessTypeDetail");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -41,7 +42,6 @@ var BusinessTypes = function BusinessTypes(props) {
     handleUpdateBusinessClick = props.handleUpdateBusinessClick,
     setBusinessTypes = props.setBusinessTypes,
     setIsExtendExtraOpen = props.setIsExtendExtraOpen;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -82,19 +82,15 @@ var BusinessTypes = function BusinessTypes(props) {
     setSelectedBusinessType(category);
     setIsExtendExtraOpen(true);
     setIsOpenTypeDetail(true);
-    var businessId = query.get('id');
-    var section = query.get('section');
-    var tab = query.get('tab');
-    history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&tab=").concat(tab, "&business_type=").concat(category === null || category === void 0 ? void 0 : category.id));
+    (0, _utils.addQueryToUrl)({
+      business_type: category === null || category === void 0 ? void 0 : category.id
+    });
   };
   var handleCloseDetail = function handleCloseDetail() {
     setIsOpenTypeDetail(false);
     setIsExtendExtraOpen(false);
     setSelectedBusinessType(null);
-    var businessId = query.get('id');
-    var section = query.get('section');
-    var tab = query.get('tab');
-    history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&tab=").concat(tab));
+    (0, _utils.removeQueryToUrl)(['business_type']);
   };
   var handleSelectBusinessTypes = function handleSelectBusinessTypes(typeId) {
     var _selectedBusinessTypes = _toConsumableArray(selectedBusinessTypes);

package/_modules/components/Stores/BusinessWalletsList/index.js

@@ -12,6 +12,7 @@ var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skelet
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _Shared = require("../../Shared");
 var _FirstSelect = require("../../../styles/Select/FirstSelect");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -36,7 +37,6 @@ var BusinessWalletsListUI = function BusinessWalletsListUI(props) {
     isClose = props.isClose,
     handleClosePaymethodDetails = props.handleClosePaymethodDetails,
     handleUpdateWallet = props.handleUpdateWallet;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -73,9 +73,9 @@ var BusinessWalletsListUI = function BusinessWalletsListUI(props) {
     setIsExtendExtraOpen(true);
     setIsOpenDetails(true);
     if (!isInitialRender) {
-      var businessId = query.get('id');
-      var section = query.get('section');
-      history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&wallet=").concat(config.id));
+      (0, _utils.addQueryToUrl)({
+        wallet: config.id
+      });
     }
   };
   var handleCloseWallet = function handleCloseWallet() {
@@ -83,9 +83,7 @@ var BusinessWalletsListUI = function BusinessWalletsListUI(props) {
     setIsOpenDetails(false);
     setIsExtendExtraOpen(false);
     setCurrentConfig(null);
-    var businessId = query.get('id');
-    var section = query.get('section');
-    history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section));
+    (0, _utils.removeQueryToUrl)(['wallet']);
   };
   (0, _react.useEffect)(function () {
     var _currentConfig$option;

package/_modules/components/Stores/BusinessWebhooks/index.js

@@ -96,6 +96,9 @@ var BusinessWebhooksUI = function BusinessWebhooksUI(props) {
   }, {
     value: 'orders_delivery_failed_driver',
     content: t('ORDERS_DELIVERY_FAILED_DRIVER')
+  }, {
+    value: 'orders_unassigned_driver',
+    content: t('ORDERS_UNASSIGNED_DRIVER', 'Order unassigned driver')
   }, {
     value: 'preorder_updated',
     content: t('PREORDER_UPDATED', 'Preorder updated')
@@ -109,12 +112,6 @@ var BusinessWebhooksUI = function BusinessWebhooksUI(props) {
   }, {
     value: '0',
     content: t('IMMEDIATELY', 'Immediately')
-  }, {
-    value: 'delivery_time',
-    content: t('DELIVERY_TIME', 'Delivery time')
-  }, {
-    value: 'pickup_time',
-    content: t('PICKUP_TIME', 'Pickup time')
   }, {
     value: '300',
     content: "5 ".concat(t('MINUTES', 'Minutes'))
@@ -124,6 +121,15 @@ var BusinessWebhooksUI = function BusinessWebhooksUI(props) {
   }, {
     value: '900',
     content: "15 ".concat(t('MINUTES', 'Minutes'))
+  }, {
+    value: 'delivery_time',
+    content: t('DELIVERY_TIME', 'Delivery time')
+  }, {
+    value: 'pickup_time',
+    content: t('PICKUP_TIME', 'Pickup time')
+  }, {
+    value: 'preparation_time',
+    content: t('PREPARATION_TIME', 'Preparation time')
   }];
   var closeAlert = function closeAlert() {
     setAlertState({

package/_modules/components/Stores/BusinessesList/index.js

@@ -12,6 +12,7 @@ var _styles = require("../../../styles");
 var _styledComponents = require("styled-components");
 var _SingleBusiness = require("../SingleBusiness");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -49,7 +50,8 @@ var BusinessesList = function BusinessesList(props) {
     selectedBusinessActiveState = props.selectedBusinessActiveState,
     setBusinessIds = props.setBusinessIds,
     handleGotToAdd = props.handleGotToAdd,
-    citiesList = props.citiesList;
+    citiesList = props.citiesList,
+    isUseQuery = props.isUseQuery;
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -138,6 +140,13 @@ var BusinessesList = function BusinessesList(props) {
     });
     setIsAllChecked(_isAllChecked);
   }, [JSON.stringify(businessList.businesses), businessIds]);
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !(pagination !== null && pagination !== void 0 && pagination.currentPage) || !(pagination !== null && pagination !== void 0 && pagination.pageSize) || !(pagination !== null && pagination !== void 0 && pagination.total)) return;
+    (0, _utils.addQueryToUrl)({
+      page: pagination.currentPage,
+      pageSize: pagination.pageSize
+    });
+  }, [pagination === null || pagination === void 0 ? void 0 : pagination.currentPage, pagination === null || pagination === void 0 ? void 0 : pagination.pageSize, pagination === null || pagination === void 0 ? void 0 : pagination.total]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, viewMethod === 'list' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.BusinessListContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.BusinessListTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.BusinessIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
     className: "all-checkbox",
     isChecked: !(businessList !== null && businessList !== void 0 && businessList.loading) && isAllChecked,

package/_modules/components/Stores/BusinessesListing/index.js

@@ -66,8 +66,8 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
     filterValues = props.filterValues,
     businessTypeSelected = props.businessTypeSelected,
     inActiveBusinesses = props.inActiveBusinesses,
-    citiesList = props.citiesList;
-  var history = (0, _reactRouterDom.useHistory)();
+    citiesList = props.citiesList,
+    isUseQuery = props.isUseQuery;
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -210,16 +210,19 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
     }
     if (method === 'card') {
       getPageBusinesses(50, 1);
+      (0, _utils.removeQueryToUrl)(['page', 'pageSize']);
     }
   };
   var handleOpenSync = function handleOpenSync() {
     setOpenSync(true);
-    history.replace("".concat(location.pathname, "?header=sync"));
+    (0, _utils.addQueryToUrl)({
+      header: 'sync'
+    });
   };
   var handleCloseSync = function handleCloseSync() {
     setMoveDistance(0);
     setOpenSync(false);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['header', 'tab']);
   };
   (0, _react.useEffect)(function () {
     handleSetStorage();
@@ -246,6 +249,7 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
     handleChangeFilterValues: handleChangeFilterValues,
     filterValues: filterValues
   }), !noBusinesses && /*#__PURE__*/_react.default.createElement(_styles.ViewContainer, null, /*#__PURE__*/_react.default.createElement(_BusinessActiveStateFilter.BusinessActiveStateFilter, {
+    isUseQuery: isUseQuery,
     selectedBusinessActiveState: selectedBusinessActiveState,
     handleChangeBusinessActiveState: handleChangeBusinessActiveState
   }), /*#__PURE__*/_react.default.createElement(_styles.WrapperView, null, /*#__PURE__*/_react.default.createElement(_styles.ViewMethodButton, {
@@ -295,7 +299,8 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
     handleEnableAllBusiness: handleEnableAllBusiness,
     selectedBusinessActiveState: selectedBusinessActiveState,
     handleGotToAdd: handleGotToAdd,
-    citiesList: citiesList
+    citiesList: citiesList,
+    isUseQuery: isUseQuery && viewMethod === 'list'
   })), openBusinessDetails && /*#__PURE__*/_react.default.createElement(_BusinessDetails.BusinessDetails, {
     open: openBusinessDetails
     // business={detailsBusiness}
@@ -337,12 +342,22 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
   }, /*#__PURE__*/_react.default.createElement(_BusinessAddStore.BusinessAddStore, null)));
 };
 var BusinessesListing = function BusinessesListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
+  var defaultActive = query.get('active');
   var businessListingProps = _objectSpread(_objectSpread({}, props), {}, {
     UIComponent: BusinessesListingUI,
     asDashboard: true,
     isSearchByBusinessName: true,
     isSearchByBusinessEmail: true,
-    isSearchByBusinessPhone: true
+    isSearchByBusinessPhone: true,
+    paginationSettings: {
+      initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
+      pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
+      controlType: 'pages'
+    },
+    defaultActive: defaultActive ? defaultActive === 'true' : true
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.DashboardBusinessList, businessListingProps);
 };

package/_modules/components/Stores/ImportersButton/index.js

@@ -13,6 +13,7 @@ var _styles = require("../../../styles");
 var _ImportersListing = require("../ImportersListing");
 var _Shared = require("../../Shared");
 var _styles2 = require("./styles");
+var _utils = require("../../../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -23,7 +24,6 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var ImportersButton = function ImportersButton(props) {
   var setOpenSidebar = props.setOpenSidebar;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -39,11 +39,13 @@ var ImportersButton = function ImportersButton(props) {
   var handleOpenImporters = function handleOpenImporters() {
     setOpenSidebar && setOpenSidebar('importer');
     setOpenImporters(true);
-    history.replace("".concat(location.pathname, "?header=importers"));
+    (0, _utils.addQueryToUrl)({
+      header: 'importers'
+    });
   };
   var handleCloseImporters = function handleCloseImporters() {
     setOpenImporters(false);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['header']);
   };
   (0, _react.useEffect)(function () {
     var header = query.get('header');

package/_modules/components/Stores/PaymentOption/index.js

@@ -17,6 +17,7 @@ var _styledComponents = require("styled-components");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _reactBootstrap = require("react-bootstrap");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles3 = require("./styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -49,7 +50,6 @@ var PaymentOption = function PaymentOption(props) {
     handleSaveClick = props.handleSaveClick,
     businessPaymethod = props.businessPaymethod,
     handleDeletePaymethod = props.handleDeletePaymethod;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -162,10 +162,9 @@ var PaymentOption = function PaymentOption(props) {
   var handleTabClick = function handleTabClick(tab, isInitialRender) {
     setPaymentTabs(tab);
     if (!isInitialRender) {
-      var businessId = query.get('id');
-      var section = query.get('section');
-      var paymethod = query.get('paymethod');
-      history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&paymethod=").concat(paymethod, "&payemthod_tab=").concat(tab));
+      (0, _utils.addQueryToUrl)({
+        payemthod_tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

package/_modules/components/Stores/PaymentOptionMethods/index.js

@@ -16,6 +16,7 @@ var _styledComponents = require("styled-components");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _reactBootstrap = require("react-bootstrap");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 var _styles3 = require("../BusinessMenu/styles");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -53,7 +54,6 @@ var PaymentOptionMethods = function PaymentOptionMethods(props) {
     handleDeletePaymethod = props.handleDeletePaymethod,
     id = props.id,
     title = props.title;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -169,10 +169,9 @@ var PaymentOptionMethods = function PaymentOptionMethods(props) {
   var handleTabClick = function handleTabClick(tab, isInitialRender) {
     setPaymentTabs(tab);
     if (!isInitialRender) {
-      var businessId = query.get('id');
-      var section = query.get('section');
-      var paymethod = query.get('paymethod');
-      history.replace("".concat(location.pathname, "?id=").concat(businessId, "&section=").concat(section, "&paymethod=").concat(paymethod, "&payemthod_tab=").concat(tab));
+      (0, _utils.addQueryToUrl)({
+        payemthod_tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {