ordering-ui-admin-external 1.33.1 → 1.35.0

package/_modules/components/Marketing/CampaignDetail/index.js

@@ -14,6 +14,7 @@ var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _Shared = require("../../Shared");
 var _CampaignDetailGeneral = require("../CampaignDetailGeneral");
 var _CampaignDetailContent = require("../CampaignDetailContent");
+var _utils = require("../../../utils");
 var _styles = require("./styles");
 var _styles2 = require("../../../styles");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
@@ -36,7 +37,6 @@ var CampaignDetailUI = function CampaignDetailUI(props) {
     formState = props.formState,
     campaignState = props.campaignState,
     handleDeleteCampaign = props.handleDeleteCampaign;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
@@ -110,8 +110,9 @@ var CampaignDetailUI = function CampaignDetailUI(props) {
   var handleTabClick = function handleTabClick(tab, isInitialRender) {
     setSelectedOption(tab);
     if (!isInitialRender) {
-      var id = query.get('id');
-      history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(tab));
+      (0, _utils.addQueryToUrl)({
+        tab: tab
+      });
     }
   };
   (0, _react.useEffect)(function () {

package/_modules/components/Marketing/CampaignList/index.js

@@ -10,6 +10,7 @@ var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skelet
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _styles = require("../../../styles");
 var _Shared = require("../../Shared");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 var _CampaignUsersList = require("../CampaignUsersList");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -39,7 +40,8 @@ var CampaignList = function CampaignList(props) {
     handleOpenDetail = props.handleOpenDetail,
     selectedCampaign = props.selectedCampaign,
     handleUpdateCampaign = props.handleUpdateCampaign,
-    setSelectedCampaign = props.setSelectedCampaign;
+    setSelectedCampaign = props.setSelectedCampaign,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -123,6 +125,13 @@ var CampaignList = function CampaignList(props) {
     setSelectedCampaign(campaign);
     setOpenModal(true);
   };
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.currentPage) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.pageSize) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.totalPages)) return;
+    (0, _utils.addQueryToUrl)({
+      page: paginationProps.currentPage,
+      pageSize: paginationProps.pageSize
+    });
+  }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement(_styles2.Table, {
     isRelative: (campaignList === null || campaignList === void 0 || (_campaignList$campaig = campaignList.campaigns) === null || _campaignList$campaig === void 0 ? void 0 : _campaignList$campaig.length) > 5
   }, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.campaign) && /*#__PURE__*/_react.default.createElement("th", null, t('CAMPAIGN', 'Campaign')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.contact_type) && /*#__PURE__*/_react.default.createElement("th", null, t('CONTACT_TYPE', 'Contact type')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.audience) && /*#__PURE__*/_react.default.createElement("th", null, t('AUDIENCE', 'Audience')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.in_queue) && /*#__PURE__*/_react.default.createElement("th", null, t('IN_QUEUE', 'In Queue')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.sent_count) && /*#__PURE__*/_react.default.createElement("th", null, t('SENT', 'Sent')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.open_count) && /*#__PURE__*/_react.default.createElement("th", null, t('OPENS', 'Opens')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.unsubscribed_count) && /*#__PURE__*/_react.default.createElement("th", null, t('UNSUBSCRIBED', 'Unsubscribed')), (allowColumns === null || allowColumns === void 0 ? void 0 : allowColumns.bounced_count) && /*#__PURE__*/_react.default.createElement("th", null, t('BOUNCES', 'Bounces')), /*#__PURE__*/_react.default.createElement("th", {

package/_modules/components/Marketing/CampaignListing/index.js

@@ -12,6 +12,7 @@ var _CampaignDetail = require("../CampaignDetail");
 var _CampaignHeader = require("../CampaignHeader");
 var _CampaignList = require("../CampaignList");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
+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; }
@@ -28,7 +29,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var CampaignListingUI = function CampaignListingUI(props) {
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -46,12 +46,14 @@ var CampaignListingUI = function CampaignListingUI(props) {
     setSelectedCampaign(action);
     setSelectedCampaignId(action === null || action === void 0 ? void 0 : action.id);
     setIsOpenDetail(true);
-    action && history.replace("".concat(location.pathname, "?id=").concat(action === null || action === void 0 ? void 0 : action.id));
+    (0, _utils.addQueryToUrl)({
+      id: action === null || action === void 0 ? void 0 : action.id
+    });
   };
   var handleCloseDetail = function handleCloseDetail() {
     setIsOpenDetail(false);
     setSelectedCampaign(null);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['id']);
   };
   (0, _react.useEffect)(function () {
     var id = query.get('id');
@@ -84,10 +86,18 @@ var CampaignListingUI = function CampaignListingUI(props) {
 };
 exports.CampaignListingUI = CampaignListingUI;
 var CampaignListing = function CampaignListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var campaignListingProps = _objectSpread(_objectSpread({}, props), {}, {
     UIComponent: CampaignListingUI,
     isSearchByContactType: true,
-    isSearchByName: true
+    isSearchByName: true,
+    paginationSettings: {
+      initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
+      pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
+      controlType: 'pages'
+    }
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.CampaignListing, campaignListingProps);
 };

package/_modules/components/Marketing/EnterprisePromotionList/index.js

@@ -12,6 +12,7 @@ var _styledComponents = require("styled-components");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _Shared = require("../../Shared");
 var _styles = 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); }
@@ -45,7 +46,8 @@ var EnterprisePromotionList = function EnterprisePromotionList(props) {
     handleDrop = props.handleDrop,
     handleDragEnd = props.handleDragEnd,
     handleEnablePromotion = props.handleEnablePromotion,
-    isPromotionBottom = props.isPromotionBottom;
+    isPromotionBottom = props.isPromotionBottom,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -124,6 +126,13 @@ var EnterprisePromotionList = function EnterprisePromotionList(props) {
       handleChangePage(paginationProps.currentPage - 1);
     }
   }, [promotionListState.promotions, paginationProps]);
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.currentPage) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.pageSize) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.totalPages)) return;
+    (0, _utils.addQueryToUrl)({
+      page: paginationProps.currentPage,
+      pageSize: paginationProps.pageSize
+    });
+  }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.PromotionListContainer, {
     eventDisabled: eventDisabled
   }, /*#__PURE__*/_react.default.createElement(_styles2.PromotionListTable, {

package/_modules/components/Marketing/EnterprisePromotionListing/index.js

@@ -15,6 +15,7 @@ var _Shared = require("../../Shared");
 var _EnterprisePromotionList = require("../EnterprisePromotionList");
 var _EnterprisePromotionDetails = require("../EnterprisePromotionDetails");
 var _DisabledFeatureAlert = require("../../DisabledFeatureAlert");
+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; }
@@ -40,7 +41,6 @@ var EnterprisePromotionListingUI = function EnterprisePromotionListingUI(props)
     paymethodsState = props.paymethodsState,
     businessesList = props.businessesList,
     handleSuccessDeletePromotion = props.handleSuccessDeletePromotion;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -98,7 +98,9 @@ var EnterprisePromotionListingUI = function EnterprisePromotionListingUI(props)
     setCurPromotionId(promotion === null || promotion === void 0 ? void 0 : promotion.id);
     setOpenDetails(true);
     if (promotion) {
-      history.replace("".concat(location.pathname, "?id=").concat(promotion === null || promotion === void 0 ? void 0 : promotion.id));
+      (0, _utils.addQueryToUrl)({
+        id: promotion === null || promotion === void 0 ? void 0 : promotion.id
+      });
     }
   };
   var handleCloseDetails = function handleCloseDetails() {
@@ -106,7 +108,7 @@ var EnterprisePromotionListingUI = function EnterprisePromotionListingUI(props)
     setSideBarWidth(600);
     setOpenDetails(false);
     setSelectedPromotion(null);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['id']);
   };
   (0, _react.useEffect)(function () {
     if (!(promotionListState !== null && promotionListState !== void 0 && promotionListState.error)) return;
@@ -195,8 +197,16 @@ var EnterprisePromotionListingUI = function EnterprisePromotionListingUI(props)
   }));
 };
 var EnterprisePromotionListing = function EnterprisePromotionListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var enterpisePromotionsProps = _objectSpread(_objectSpread({}, props), {}, {
-    UIComponent: EnterprisePromotionListingUI
+    UIComponent: EnterprisePromotionListingUI,
+    paginationSettings: {
+      initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
+      pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
+      controlType: 'pages'
+    }
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.EnterprisePromotionList, enterpisePromotionsProps);
 };

package/_modules/components/Marketing/PageBanner/index.js

@@ -13,6 +13,7 @@ var _Shared = require("../../Shared");
 var _styles = require("../../../styles");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _BannerDetails = require("../BannerDetails");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -47,7 +48,6 @@ var PageBannersUI = function PageBannersUI(props) {
     handleSuccessDelete = props.handleSuccessDelete,
     aspectRatio = props.aspectRatio,
     isSearhShow = props.isSearhShow;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -90,16 +90,16 @@ var PageBannersUI = function PageBannersUI(props) {
     setOpenItemsDetail(true);
     setMoveDistance(500);
     if (banner && !isInitialRender) {
-      var position = query.get('position');
-      history.replace("".concat(location.pathname, "?position=").concat(position, "&banner=").concat(banner === null || banner === void 0 ? void 0 : banner.id));
+      (0, _utils.addQueryToUrl)({
+        banner: banner === null || banner === void 0 ? void 0 : banner.id
+      });
     }
   };
   var handleCloseDetail = function handleCloseDetail() {
     setMoveDistance(0);
     setOpenItemsDetail(false);
     setSelectedBanner(null);
-    var position = query.get('position');
-    history.replace("".concat(location.pathname, "?position=").concat(position));
+    (0, _utils.removeQueryToUrl)(['banner']);
   };
   var expandSidebar = function expandSidebar() {
     var element = document.getElementById('sideSlider');

package/_modules/components/Messages/MessagesListing/index.js

@@ -15,6 +15,7 @@ var _ChatContactList = require("../ChatContactList");
 var _ChatBusinessesList = require("../ChatBusinessesList");
 var _Shared = require("../../Shared");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
+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); }
@@ -39,8 +40,8 @@ var MessagesListingUI = function MessagesListingUI(props) {
     filterValues = props.filterValues,
     selectedSubOrderStatus = props.selectedSubOrderStatus,
     handleChangeSearch = props.handleChangeSearch,
-    handleChangeFilterValues = props.handleChangeFilterValues;
-  var history = (0, _reactRouterDom.useHistory)();
+    handleChangeFilterValues = props.handleChangeFilterValues,
+    isUseQuery = props.isUseQuery;
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -91,7 +92,15 @@ var MessagesListingUI = function MessagesListingUI(props) {
     setDetailsOrder(order);
     setOrderDetailId(order.id);
     setIsOpenOrderDetail(true);
-    history.replace("".concat(location.pathname, "?id=").concat(order.id));
+    if (isUseQuery) {
+      (0, _utils.addQueryToUrl)({
+        id: order.id
+      });
+    }
+  };
+  var handleCloseOrderDetail = function handleCloseOrderDetail() {
+    setIsOpenOrderDetail(false);
+    (0, _utils.removeQueryToUrl)(['id']);
   };
   var handleOrderCardClick = function handleOrderCardClick(order) {
     setSelectedOrder(_objectSpread({}, order));
@@ -170,7 +179,8 @@ var MessagesListingUI = function MessagesListingUI(props) {
     orderIdForUnreadCountUpdate: orderIdForUnreadCountUpdate,
     handleOpenOrderDetail: handleOpenOrderDetail,
     handleOrderCardClick: handleOrderCardClick,
-    timeStatus: timeStatus
+    timeStatus: timeStatus,
+    isUseQuery: isUseQuery
   }), selectedOption === 'contacts' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, contactsOption === 'drivers' && /*#__PURE__*/_react.default.createElement(_ChatContactList.ChatContactList, {
     isDriver: true
   }), contactsOption === 'customers' && /*#__PURE__*/_react.default.createElement(_ChatContactList.ChatContactList, {
@@ -188,7 +198,7 @@ var MessagesListingUI = function MessagesListingUI(props) {
     orderId: orderDetailId,
     drivers: driversList.drivers,
     onClose: function onClose() {
-      return setIsOpenOrderDetail(false);
+      return handleCloseOrderDetail();
     }
   }), /*#__PURE__*/_react.default.createElement(_Orders.OrderNotification, null));
 };

package/_modules/components/MyProducts/AdvancedSettings/index.js

@@ -139,6 +139,18 @@ var AdvancedSettings = function AdvancedSettings(props) {
     name: t('NEAR_BUSINESS_BLOCK', 'Near business block'),
     type: 'hidden',
     path: 'business_view.components.near_business.hidden'
+  }, {
+    name: t('BUSINESS_LOGO', 'Business logo'),
+    type: 'hidden',
+    path: 'business_view.components.header.components.logo.hidden'
+  }, {
+    name: t('BUSINESS_INFO_ICON', 'Business info icon'),
+    type: 'hidden',
+    path: 'business_view.components.header.components.business_info.hidden'
+  }, {
+    name: t('BUSINESS_HEADER', 'Business header'),
+    type: 'hidden',
+    path: 'business_view.components.header.hidden'
   }];
   var businessInfoList = [{
     name: t('DESCRIPTION', 'Description'),

package/_modules/components/OrderingProducts/OrderingProductDetails/index.js

@@ -13,6 +13,7 @@ var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _Shared = require("../../Shared");
 var _OrderingProductGeneralDetails = require("../OrderingProductGeneralDetails");
 var _SiteTheme = require("../SiteTheme");
+var _utils = require("../../../utils");
 var _styles2 = require("./styles");
 var _useWindowSize2 = require("../../../hooks/useWindowSize");
 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); }
@@ -33,7 +34,6 @@ var OrderingProductDetailsUI = function OrderingProductDetailsUI(props) {
   var siteState = props.siteState,
     isAddMode = props.isAddMode,
     handleDeleteSite = props.handleDeleteSite;
-  var history = (0, _reactRouterDom.useHistory)();
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -92,7 +92,9 @@ var OrderingProductDetailsUI = function OrderingProductDetailsUI(props) {
     if (!isInitialRender) {
       var id = query.get('id');
       if (id) {
-        history.replace("".concat(location.pathname, "?id=").concat(id, "&tab=").concat(tab));
+        (0, _utils.addQueryToUrl)({
+          tab: tab
+        });
       }
     }
   };

package/_modules/components/OrderingProducts/OrderingProductsListing/index.js

@@ -14,6 +14,7 @@ var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _styles = require("../../../styles");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _OrderingProductDetails = require("../OrderingProductDetails");
+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); }
@@ -41,8 +42,8 @@ var OrderingProductsUI = function OrderingProductsUI(props) {
     getSites = props.getSites,
     paginationProps = props.paginationProps,
     setPaginationProps = props.setPaginationProps,
-    handleSuccessUpdateSites = props.handleSuccessUpdateSites;
-  var history = (0, _reactRouterDom.useHistory)();
+    handleSuccessUpdateSites = props.handleSuccessUpdateSites,
+    isUseQuery = props.isUseQuery;
   var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -80,13 +81,15 @@ var OrderingProductsUI = function OrderingProductsUI(props) {
     setSelectedSite(product);
     setOpenDetails(true);
     if (product && !isInitialRender) {
-      history.replace("".concat(location.pathname, "?id=").concat(product === null || product === void 0 ? void 0 : product.id));
+      (0, _utils.addQueryToUrl)({
+        id: product === null || product === void 0 ? void 0 : product.id
+      });
     }
   };
   var handleCloseDetail = function handleCloseDetail() {
     setOpenDetails(false);
     setSelectedSite(null);
-    history.replace("".concat(location.pathname));
+    (0, _utils.removeQueryToUrl)(['id']);
   };
   (0, _react.useEffect)(function () {
     if (!(sitesListState !== null && sitesListState !== void 0 && sitesListState.error)) return;
@@ -105,6 +108,13 @@ var OrderingProductsUI = function OrderingProductsUI(props) {
       if (initProduct) onClickProduct(initProduct, true);
     }
   }, [sitesListState]);
+  (0, _react.useEffect)(function () {
+    if (!isUseQuery || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.currentPage) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.pageSize) || !(paginationProps !== null && paginationProps !== void 0 && paginationProps.totalPages)) return;
+    (0, _utils.addQueryToUrl)({
+      page: paginationProps.currentPage,
+      pageSize: paginationProps.pageSize
+    });
+  }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.OrderingProductsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderTitleContainer, null, isCollapse && /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
     color: "black",
     onClick: function onClick() {
@@ -200,8 +210,16 @@ var OrderingProductsUI = function OrderingProductsUI(props) {
   }));
 };
 var OrderingProductsListing = function OrderingProductsListing(props) {
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  var defaultPage = query.get('page') || 1;
+  var defaultPageSize = query.get('pageSize') || 10;
   var sitesProps = _objectSpread(_objectSpread({}, props), {}, {
-    UIComponent: OrderingProductsUI
+    UIComponent: OrderingProductsUI,
+    paginationSettings: {
+      initialPage: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPage) : 1,
+      pageSize: props.isUseQuery && !isNaN(defaultPage) ? Number(defaultPageSize) : 10,
+      controlType: 'pages'
+    }
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.SitesList, sitesProps);
 };

package/_modules/components/Orders/AllInOne/DriversManager/styles.js

@@ -23,5 +23,5 @@ var FilterContainer = _styledComponents.default.div(_templateObject5 || (_templa
   return ((_props$theme$colors = props.theme.colors) === null || _props$theme$colors === void 0 ? void 0 : _props$theme$colors.backgroundPage) || '#FFF';
 });
 exports.FilterContainer = FilterContainer;
-var WrapperDriversList = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  overflow-x: hidden;\n  .driver-info-container {\n    p.name {\n      min-width: 50%;\n      max-width: 50%;\n    }\n  }\n  @media (min-width: 992px) {\n    max-height: min(calc(var(--vh, 1vh) * 100 - 410px), 770px);\n  }\n"])));
+var WrapperDriversList = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  overflow-x: hidden;\n  .driver-info-container {\n    p.name {\n      min-width: 50%;\n      max-width: 50%;\n    }\n  }\n  @media (min-width: 992px) {\n    max-height: calc(var(--vh, 1vh) * 50 - 115px);\n  }\n"])));
 exports.WrapperDriversList = WrapperDriversList;

package/_modules/components/Orders/AllInOne/index.js

@@ -59,7 +59,8 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     handleCustomOrderDetail = props.handleCustomOrderDetail,
     setSelectedOrderIds = props.setSelectedOrderIds,
     allowColumns = props.allowColumns,
-    setAllowColumns = props.setAllowColumns;
+    setAllowColumns = props.setAllowColumns,
+    isUseQuery = props.isUseQuery;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -241,6 +242,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
   }), /*#__PURE__*/_react.default.createElement(_styles.MainContentContainer, null, /*#__PURE__*/_react.default.createElement(_styles.TopContent, null, /*#__PURE__*/_react.default.createElement(_styles.DriversContainer, null, /*#__PURE__*/_react.default.createElement(_DriversManager.DriversManager, {
     setMapsData: setMapsData
   })), /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, null, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
+    isUseQuery: isUseQuery,
     selectedOrderStatus: ordersStatusGroup,
     changeOrderStatus: handleOrdersStatusGroupFilter,
     ordersAmountByStatus: ordersAmountByStatus
@@ -285,12 +287,14 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     slaSettingTime: slaSettingTime,
     allowColumns: allowColumns,
     setAllowColumns: setAllowColumns,
-    setOrdersAmountByStatus: setOrdersAmountByStatus
+    setOrdersAmountByStatus: setOrdersAmountByStatus,
+    isUseQuery: isUseQuery
   })))))), /*#__PURE__*/_react.default.createElement(_styles.WrapperDriversLocation, null, /*#__PURE__*/_react.default.createElement(_DriversLocation.DriversLocation, {
     driversIsOnline: mapsData.driversIsOnline,
     selectedDriver: mapsData.selectedDriver,
     onlineDrivers: mapsData.onlineDrivers,
-    offlineDrivers: mapsData.offlineDrivers
+    offlineDrivers: mapsData.offlineDrivers,
+    selectedOrder: !(detailsOrder !== null && detailsOrder !== void 0 && detailsOrder.driver_id) ? detailsOrder : null
   })))), isOpenOrderDetail && /*#__PURE__*/_react.default.createElement(_OrderDetails.OrderDetails, {
     isSelectedOrders: isSelectedOrders,
     open: isOpenOrderDetail,

package/_modules/components/Orders/AllInOne/styles.js

@@ -45,11 +45,11 @@ var HeaderTitleContainer = _styledComponents.default.div(_templateObject15 || (_
 exports.HeaderTitleContainer = HeaderTitleContainer;
 var MainContentContainer = _styledComponents.default.div(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["\n  margin-top: 15px;\n"])));
 exports.MainContentContainer = MainContentContainer;
-var TopContent = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column-reverse;\n  margin-bottom: 20px;\n  border-bottom: 5px solid ", ";\n  @media (min-width: 992px) {\n    flex-direction: row;\n    #orderTable {\n      max-height: calc(var(--vh, 1vh) * 100 - 475px);\n    }\n  }\n"])), function (props) {
+var TopContent = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: column-reverse;\n  margin-bottom: 20px;\n  border-bottom: 5px solid ", ";\n  @media (min-width: 992px) {\n    flex-direction: row;\n    #orderTable {\n      max-height: calc(var(--vh, 1vh) * 50 - 180px);\n    }\n  }\n"])), function (props) {
   return props.theme.colors.borderColor;
 });
 exports.TopContent = TopContent;
-var WrapperDriversLocation = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  border-radius: 8px;\n  overflow: hidden;\n  height: 700px;\n"])));
+var WrapperDriversLocation = _styledComponents.default.div(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  border-radius: 8px;\n  overflow: hidden;\n  height: calc(var(--vh, 1vh) * 100 - 40px);\n\n  @media (min-width: 992px) {\n    height: calc(var(--vh, 1vh) * 50 - 115px);\n  }\n"])));
 exports.WrapperDriversLocation = WrapperDriversLocation;
 var DriversContainer = _styledComponents.default.div(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  @media (min-width: 992px) {\n    ", "\n  }\n"])), function (props) {
   var _props$theme3;

package/_modules/components/Orders/CreateCustomOrder/CustomOrderDetails/index.js

@@ -37,7 +37,6 @@ var CustomOrderDetailsUI = function CustomOrderDetailsUI(props) {
     setCustomersPhones = props.setCustomersPhones,
     handleParentSidebarMove = props.handleParentSidebarMove,
     businessList = props.businessList,
-    getBusinessList = props.getBusinessList,
     selectedUser = props.selectedUser,
     selectedBusiness = props.selectedBusiness,
     setSelectedUser = props.setSelectedUser,
@@ -51,7 +50,8 @@ var CustomOrderDetailsUI = function CustomOrderDetailsUI(props) {
     handlePlaceOrderByTotal = props.handlePlaceOrderByTotal,
     extraFields = props.extraFields,
     setExtraFields = props.setExtraFields,
-    actionState = props.actionState;
+    actionState = props.actionState,
+    customerAddress = props.customerAddress;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -60,7 +60,6 @@ var CustomOrderDetailsUI = function CustomOrderDetailsUI(props) {
     validationFields = _useValidationFields2[0];
   var _useOrder = (0, _orderingComponentsAdminExternal.useOrder)(),
     _useOrder2 = _slicedToArray(_useOrder, 2),
-    orderState = _useOrder2[0],
     changeAddress = _useOrder2[1].changeAddress;
   var _useState = (0, _react.useState)({
       open: false,
@@ -103,23 +102,10 @@ var CustomOrderDetailsUI = function CustomOrderDetailsUI(props) {
     }
     handlePlaceOrderByTotal();
   };
-  var customerAddress = (0, _react.useMemo)(function () {
-    var address = null;
-    if (selectedUser !== null && selectedUser !== void 0 && selectedUser.addresses) {
-      address = selectedUser.addresses.find(function (address) {
-        return address === null || address === void 0 ? void 0 : address.default;
-      });
-    }
-    return address;
-  }, [selectedUser]);
   (0, _react.useEffect)(function () {
     if (!(customerAddress !== null && customerAddress !== void 0 && customerAddress.id)) return;
     changeAddress(customerAddress.id);
   }, [customerAddress === null || customerAddress === void 0 ? void 0 : customerAddress.id]);
-  (0, _react.useEffect)(function () {
-    if (!(customerAddress !== null && customerAddress !== void 0 && customerAddress.location) || orderState !== null && orderState !== void 0 && orderState.loading) return;
-    getBusinessList(customerAddress.location);
-  }, [customerAddress === null || customerAddress === void 0 ? void 0 : customerAddress.location, orderState]);
   (0, _react.useEffect)(function () {
     if (customersPhones !== null && customersPhones !== void 0 && customersPhones.error) {
       setAlertState({

package/_modules/components/Orders/CreateCustomOrder/SelectCustomer/index.js

@@ -12,6 +12,7 @@ var _Delivery = require("../../../Delivery");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _FaUserAlt = _interopRequireDefault(require("@meronex/icons/fa/FaUserAlt"));
 var _CgSpinnerTwoAlt = _interopRequireDefault(require("@meronex/icons/cg/CgSpinnerTwoAlt"));
+var _MdClose = _interopRequireDefault(require("@meronex/icons/md/MdClose"));
 var _Shared = require("../../../Shared");
 var _styles = require("../../../../styles");
 var _utils = require("../../../../utils");
@@ -42,7 +43,9 @@ var SelectCustomer = function SelectCustomer(props) {
     optimizeImage = _useUtils2[0].optimizeImage;
   var _useCustomer = (0, _orderingComponentsAdminExternal.useCustomer)(),
     _useCustomer2 = _slicedToArray(_useCustomer, 2),
-    setUserCustomer = _useCustomer2[1].setUserCustomer;
+    _useCustomer2$ = _useCustomer2[1],
+    setUserCustomer = _useCustomer2$.setUserCustomer,
+    deleteUserCustomer = _useCustomer2$.deleteUserCustomer;
   var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
     _useConfig2 = _slicedToArray(_useConfig, 1),
     configs = _useConfig2[0].configs;
@@ -75,8 +78,14 @@ var SelectCustomer = function SelectCustomer(props) {
   var onSelectUser = function onSelectUser(user) {
     setUserCustomer(user, true);
     setSelectedUser(user);
+    onChangeNumber('');
     setShowSearchbar(false);
   };
+  var onRemoveCustomer = function onRemoveCustomer() {
+    deleteUserCustomer(true);
+    setSelectedUser(null);
+    setShowSearchbar(true);
+  };
   var handleOpenAddForm = function handleOpenAddForm() {
     setOpenSidebar('user_add_form');
     handleParentSidebarMove(500);
@@ -141,7 +150,12 @@ var SelectCustomer = function SelectCustomer(props) {
     }) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null)), /*#__PURE__*/_react.default.createElement("span", {
       className: "name"
     }, user === null || user === void 0 ? void 0 : user.name, " ", user === null || user === void 0 ? void 0 : user.lastname));
-  })) : /*#__PURE__*/_react.default.createElement("p", null, customersPhones.loading ? t('LOADING', 'Loading') : (phone === null || phone === void 0 ? void 0 : phone.length) > 6 ? t('NO_OPTIONS', 'No options') : t('TYPE_AT_LEAST_NUMBER_SUGGEST', 'Type at least 7 numbers for suggesstions')))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.SelectedUserWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.SelectOption, {
+  })) : /*#__PURE__*/_react.default.createElement("p", null, customersPhones.loading ? t('LOADING', 'Loading') : (phone === null || phone === void 0 ? void 0 : phone.length) > 6 ? /*#__PURE__*/_react.default.createElement("span", {
+    className: "new",
+    onClick: function onClick() {
+      return handleOpenAddForm();
+    }
+  }, t('USERS_REGISTER', 'New user')) : t('TYPE_AT_LEAST_NUMBER_SUGGEST', 'Type at least 7 numbers for suggesstions')))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.SelectedUserWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.SelectOption, {
     onClick: function onClick() {
       return setShowSearchbar(true);
     }
@@ -150,7 +164,16 @@ var SelectCustomer = function SelectCustomer(props) {
     alt: ""
   }) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null)), /*#__PURE__*/_react.default.createElement("span", {
     className: "name"
-  }, selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name, " ", selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.lastname)))), /*#__PURE__*/_react.default.createElement(_styles.Button, {
+  }, selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.name, " ", selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.lastname), /*#__PURE__*/_react.default.createElement(_styles.Button, {
+    circle: true,
+    outline: true,
+    color: "primary",
+    type: "reset",
+    className: "remove_option",
+    onClick: function onClick() {
+      return onRemoveCustomer();
+    }
+  }, /*#__PURE__*/_react.default.createElement(_MdClose.default, null))))), /*#__PURE__*/_react.default.createElement(_styles.Button, {
     borderRadius: "8px",
     color: "primary",
     disabled: openSidebar === 'user_add_form',

package/_modules/components/Orders/CreateCustomOrder/SelectCustomer/styles.js

@@ -27,14 +27,19 @@ var SearchBarWrapper = _styledComponents.default.div(_templateObject3 || (_templ
   return props.theme.colors.headingColor;
 });
 exports.SearchBarWrapper = SearchBarWrapper;
-var OptionsToSelectContainer = _styledComponents.default.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  position: absolute;\n  top: 50px;\n  left: 0;\n  width: 100%;\n  max-height: 300px;\n  overflow-x: hidden;\n  border-radius: 8px;\n  border: 1px solid ", ";\n  background-color: ", ";\n  padding: 9px 0;\n\n  > p {\n    font-size: 12px;\n    margin: 0 16px;\n  }\n"])), function (props) {
+var OptionsToSelectContainer = _styledComponents.default.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n  position: absolute;\n  top: 50px;\n  left: 0;\n  width: 100%;\n  max-height: 300px;\n  overflow-x: hidden;\n  border-radius: 8px;\n  border: 1px solid ", ";\n  background-color: ", ";\n  padding: 9px 0;\n\n  > p {\n    font-size: 12px;\n    margin: 0 16px;\n\n    > span.new {\n      cursor: pointer;\n      color: ", ";\n      &:hover {\n        text-decoration: underline;\n      }\n    }\n  }\n"])), function (props) {
   return props.theme.colors.borderColor;
 }, function (props) {
   return props.theme.colors.backgroundPage;
+}, function (props) {
+  return props.theme.colors.primary;
 });
 exports.OptionsToSelectContainer = OptionsToSelectContainer;
-var SelectOption = _styledComponents.default.div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  cursor: pointer;\n  width: 100%;\n  padding: 9px 16px;\n  display: flex;\n  align-items: center;\n\n  &:hover {\n    background-color: ", ";\n  }\n  span {\n    font-size: 14px;\n    &.name {\n      overflow: hidden;\n      text-overflow: ellipsis;\n      white-space: nowrap;\n    }\n  }\n"])), function (props) {
+var SelectOption = _styledComponents.default.div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  position: relative;\n  cursor: pointer;\n  width: 100%;\n  padding: 9px 16px;\n  display: flex;\n  align-items: center;\n\n  &:hover {\n    background-color: ", ";\n  }\n  span {\n    font-size: 14px;\n    &.name {\n      overflow: hidden;\n      text-overflow: ellipsis;\n      white-space: nowrap;\n    }\n  }\n\n  button {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    position: absolute;\n    background: ", ";\n    width: 20px;\n    height: 20px;\n    transform: translate(100%, -50%);\n    top: 11px;\n    right: 20px;\n  }\n"])), function (props) {
   return props.theme.colors.secundary;
+}, function (props) {
+  var _props$theme$colors;
+  return ((_props$theme$colors = props.theme.colors) === null || _props$theme$colors === void 0 ? void 0 : _props$theme$colors.backgroundPage) || '#FFF';
 });
 exports.SelectOption = SelectOption;
 var WrapperImage = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n  position: relative;\n  max-width: 24px;\n  max-height: 24px;\n  height: 24px;\n  width: 24px;\n  box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.1);\n  border-radius: 8px;\n  margin: 0 6px;\n\n  svg {\n    width: 100%;\n    height: 100%;\n    padding: 3px;\n    box-sizing: border-box;\n    border-radius: 50%;\n  }\n\n  img {\n    width: 100%;\n    height: 100%;\n    border-radius: 8px;\n    object-fit: cover;\n  }\n"])));