ordering-ui-admin-external 1.14.3 → 1.15.1

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MessagesUI = exports.Messages = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactHookForm = require("react-hook-form");
 var _styledComponents = require("styled-components");
@@ -63,6 +64,8 @@ var MessagesUI = function MessagesUI(props) {
     isTourOpen = props.isTourOpen,
     setCurrentTourStep = props.setCurrentTourStep,
     orderDetailClose = props.orderDetailClose;
+  var routerHistory = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -90,11 +93,7 @@ var MessagesUI = function MessagesUI(props) {
     _useState2 = _slicedToArray(_useState, 2),
     alertState = _useState2[0],
     setAlertState = _useState2[1];
-  var _useState3 = (0, _react.useState)({
-      orderHistory: true,
-      logistics: false,
-      logistic_information: false
-    }),
+  var _useState3 = (0, _react.useState)('order_history'),
     _useState4 = _slicedToArray(_useState3, 2),
     tabActive = _useState4[0],
     setTabActive = _useState4[1];
@@ -120,7 +119,6 @@ var MessagesUI = function MessagesUI(props) {
     setIsChatDisabled = _useState14[1];
   var previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17];
   var chatDisabled = previousStatus.includes(order === null || order === void 0 ? void 0 : order.status);
-  console.log(order === null || order === void 0 ? void 0 : order.status);
   var adminMessageList = [{
     key: 'message_1',
     text: t('ADMIN_MESSAGE_1', 'admin_message_1')
@@ -391,6 +389,23 @@ var MessagesUI = function MessagesUI(props) {
       if (!(canRead !== null && canRead !== void 0 && canRead.customer) && !(canRead !== null && canRead !== void 0 && canRead.driver)) setIsChatDisabled(true);else setIsChatDisabled(false);
     }
   }, [canRead]);
+  var handleTabClick = function handleTabClick(tab, isInitialRender) {
+    setTabActive(tab);
+    if (!isInitialRender) {
+      var orderId = query.get('id');
+      var section = query.get('section');
+      routerHistory.replace("".concat(location.pathname, "?id=").concat(orderId, "&section=").concat(section, "&tab=").concat(tab));
+    }
+  };
+  (0, _react.useEffect)(function () {
+    if (!history) return;
+    var tab = query.get('tab');
+    if (tab) {
+      handleTabClick(tab, true);
+    } else {
+      handleTabClick('order_history');
+    }
+  }, [history]);
   return /*#__PURE__*/_react.default.createElement(_styles.MessagesContainer, null, /*#__PURE__*/_react.default.createElement(_styles.WrapperContainer, {
     onClick: handleChangeTour
   }, /*#__PURE__*/_react.default.createElement(_styles.HeaderProfile, null, /*#__PURE__*/_react.default.createElement(_styles.WrapperHeader, {
@@ -406,31 +421,19 @@ var MessagesUI = function MessagesUI(props) {
     src: optimizeImage((_order$driver = order.driver) === null || _order$driver === void 0 ? void 0 : _order$driver.photo, 'w_40,c_limit'),
     fallback: /*#__PURE__*/_react.default.createElement(_RiUser2Fill.default, null)
   }))), history && /*#__PURE__*/_react.default.createElement(_styles.WrapperHitoryHeader, null, /*#__PURE__*/_react.default.createElement(_styles.TabItem, {
-    active: tabActive.orderHistory,
+    active: tabActive === 'order_history',
     onClick: function onClick() {
-      return setTabActive({
-        orderHistory: true,
-        logistics: false,
-        logistic_information: false
-      });
+      return handleTabClick('order_history');
     }
   }, t('MOBILE_ORDER_HISTORY', 'Order History')), /*#__PURE__*/_react.default.createElement(_styles.TabItem, {
-    active: tabActive.logistics,
+    active: tabActive === 'logistics',
     onClick: function onClick() {
-      return setTabActive({
-        orderHistory: false,
-        logistics: true,
-        logistic_information: false
-      });
+      return handleTabClick('logistics');
     }
   }, t('LOGISTICS', 'Logistics')), /*#__PURE__*/_react.default.createElement(_styles.TabItem, {
-    active: tabActive.logistic_information,
+    active: tabActive === 'logistic_information',
     onClick: function onClick() {
-      return setTabActive({
-        orderHistory: false,
-        logistics: false,
-        logistic_information: true
-      });
+      return handleTabClick('logistic_information');
     }
   }, t('LOGISTIC_INFORMATION', 'Logistics information')))), messageDashboardView && /*#__PURE__*/_react.default.createElement(_styles.SearchAndDetailControlContainer, null, /*#__PURE__*/_react.default.createElement(_styles.MessagesSearch, null, /*#__PURE__*/_react.default.createElement("img", {
     src: theme === null || theme === void 0 ? void 0 : (_theme$images = theme.images) === null || _theme$images === void 0 ? void 0 : (_theme$images$icons = _theme$images.icons) === null || _theme$images$icons === void 0 ? void 0 : _theme$images$icons.search,
@@ -480,21 +483,21 @@ var MessagesUI = function MessagesUI(props) {
       width: 450,
       height: 50
     }));
-  }))), !messages.loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !tabActive.logistic_information && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, null, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, t('ORDER_PLACED_FOR', 'Order placed for'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, parseDate(order.created_at)), " ", ' ', t('VIA', 'via'), " ", /*#__PURE__*/_react.default.createElement("strong", null, order.app_id ? t(order.app_id.toUpperCase(), "".concat(order.app_id)) : ''), ' ', /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
+  }))), !messages.loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !tabActive === 'logistic_information' && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, null, /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, t('ORDER_PLACED_FOR', 'Order placed for'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, parseDate(order.created_at)), " ", ' ', t('VIA', 'via'), " ", /*#__PURE__*/_react.default.createElement("strong", null, order.app_id ? t(order.app_id.toUpperCase(), "".concat(order.app_id)) : ''), ' ', /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
     placement: "top",
     overlay: /*#__PURE__*/_react.default.createElement(_reactBootstrap.Tooltip, null, parseDate(order.created_at))
-  }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(order.created_at))))), history && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tabActive.logistics && /*#__PURE__*/_react.default.createElement(_styles.WrapperLogistics, null, /*#__PURE__*/_react.default.createElement(_Logistics.Logistics, {
+  }, /*#__PURE__*/_react.default.createElement(_styles.TimeofSent, null, getTimeAgo(order.created_at))))), history && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, tabActive === 'logistics' && /*#__PURE__*/_react.default.createElement(_styles.WrapperLogistics, null, /*#__PURE__*/_react.default.createElement(_Logistics.Logistics, {
     orderId: order.id
-  })), tabActive.logistic_information && /*#__PURE__*/_react.default.createElement(_styles.WrapperLogisticInformation, null, /*#__PURE__*/_react.default.createElement(_OrderLogisticInformation.OrderLogisticInformation, {
+  })), tabActive === 'logistic_information' && /*#__PURE__*/_react.default.createElement(_styles.WrapperLogisticInformation, null, /*#__PURE__*/_react.default.createElement(_OrderLogisticInformation.OrderLogisticInformation, {
     orderId: order.id
   }))), filteredMessages.length > 0 && filteredMessages.map(function (message) {
     var _message$change, _message$change2, _message$change3, _message$change4, _message$change5, _message$author, _message$author2, _message$author$name, _message$author3, _message$author$lastn, _message$author4, _message$driver, _message$driver2, _message$change6, _message$change7, _message$change8, _message$change9, _message$change10, _message$change11, _message$change12, _message$change13, _message$change14, _message$author5, _message$author6, _message$author$name2, _message$author7, _message$author$lastn2, _message$author8, _message$driver3, _message$driver4, _order$business2, _order$customer2, _order$driver2, _order$business3, _order$customer3, _order$driver3, _order$business4, _order$customer4, _order$driver4, _order$business5, _order$customer5, _order$driver5;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
       key: message.id
-    }, history && tabActive.orderHistory && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
+    }, history && tabActive === 'order_history' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, message.type === 1 && /*#__PURE__*/_react.default.createElement(_styles.MessageConsole, {
       key: message.id,
       style: {
-        display: "".concat(tabActive.orderHistory ? 'inline-flex' : 'none')
+        display: "".concat(tabActive === 'order_history' ? 'inline-flex' : 'none')
       }
     }, ((_message$change = message.change) === null || _message$change === void 0 ? void 0 : _message$change.attribute) !== 'driver_id' ? /*#__PURE__*/_react.default.createElement(_styles.BubbleConsole, null, t('ORDER', 'Order'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, t(message.change.attribute)), " ", ' ', t('CHANGED_FROM', 'Changed from'), " ", ' ', message.change.old !== null && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("strong", null, ((_message$change2 = message.change) === null || _message$change2 === void 0 ? void 0 : _message$change2.attribute) === 'logistic_status' ? getLogisticTagStatus(parseInt(message.change.old, 10)) : getStatus(parseInt(message.change.old, 10))), " ", ' '), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, t('TO', 'to'), " ", ' ', /*#__PURE__*/_react.default.createElement("strong", null, message.change.old === null && message.change.attribute === 'delivery_in' ? 'null' : ((_message$change3 = message.change) === null || _message$change3 === void 0 ? void 0 : _message$change3.attribute) === 'logistic_status' ? getLogisticTagStatus(parseInt(message.change.new, 10)) : getStatus(parseInt(message.change.new, 10))), message !== null && message !== void 0 && (_message$change4 = message.change) !== null && _message$change4 !== void 0 && _message$change4.comment ? "\n'".concat(message === null || message === void 0 ? void 0 : (_message$change5 = message.change) === null || _message$change5 === void 0 ? void 0 : _message$change5.comment, "'") : '', ((message === null || message === void 0 ? void 0 : (_message$author = message.author) === null || _message$author === void 0 ? void 0 : _message$author.name) || (message === null || message === void 0 ? void 0 : (_message$author2 = message.author) === null || _message$author2 === void 0 ? void 0 : _message$author2.lastname)) && /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement("strong", null, "Author: "), ((_message$author$name = message === null || message === void 0 ? void 0 : (_message$author3 = message.author) === null || _message$author3 === void 0 ? void 0 : _message$author3.name) !== null && _message$author$name !== void 0 ? _message$author$name : '') + ' ' + ((_message$author$lastn = message === null || message === void 0 ? void 0 : (_message$author4 = message.author) === null || _message$author4 === void 0 ? void 0 : _message$author4.lastname) !== null && _message$author$lastn !== void 0 ? _message$author$lastn : ''))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.OverlayTrigger, {
       placement: "top",

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.OrderDetails = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _ProductItemAccordion = require("../ProductItemAccordion");
@@ -52,6 +53,8 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
     actionStatus = props.actionStatus,
     handleRefundOrder = props.handleRefundOrder,
     isServiceOrder = props.isServiceOrder;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -276,8 +279,14 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
       customer: customer
     });
   };
-  var handleOpenMessages = function handleOpenMessages(openMessage) {
-    if (openMessage === 'chat') {
+  var handleCloseMessages = function handleCloseMessages() {
+    setOpenMessages({
+      chat: false,
+      history: false
+    });
+  };
+  var handleShowOption = function handleShowOption(option, isInitialRender) {
+    if (option === 'chat') {
       setOpenMessages({
         chat: true,
         history: false
@@ -285,26 +294,25 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
       setUnreadAlert(_objectSpread(_objectSpread({}, unreadAlert), {}, {
         customer: false
       }));
-    }
-    if (openMessage === 'history') {
+      setShowOption(null);
+    } else if (option === 'history') {
       setOpenMessages({
         chat: false,
         history: true
       });
+      setShowOption(null);
+    } else {
+      setOpenMessages({
+        chat: false,
+        history: false
+      });
+      setShowOption(option);
     }
-    setShowOption(null);
-    setExtraOpen(true);
-  };
-  var handleCloseMessages = function handleCloseMessages() {
-    setOpenMessages({
-      chat: false,
-      history: false
-    });
-  };
-  var handleShowOption = function handleShowOption(option) {
-    handleCloseMessages();
     setExtraOpen(true);
-    setShowOption(option);
+    if (!isInitialRender) {
+      var orderId = query.get('id');
+      history.replace("".concat(location.pathname, "?id=").concat(orderId, "&section=").concat(option));
+    }
   };
   (0, _react.useEffect)(function () {
     unreadMessages();
@@ -351,7 +359,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
     }
     if (evt.target.closest('.driver-select')) return;
     if (isTourOpen && setCurrentTourStep) {
-      handleOpenMessages('chat');
+      handleShowOption('chat');
       setTimeout(function () {
         isTourOpen && setCurrentTourStep && setCurrentTourStep(3);
       }, 1);
@@ -361,7 +369,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
     if (evt.keyCode === 37 && currentTourStep === 2) setCurrentTourStep(1);
     if (evt.keyCode === 39 && currentTourStep === 1 && (order === null || order === void 0 ? void 0 : order.delivery_type) === 1) setCurrentTourStep(2);
     if (evt.keyCode === 39 && currentTourStep === 1 && (order === null || order === void 0 ? void 0 : order.delivery_type) !== 1) {
-      handleOpenMessages('chat');
+      handleShowOption('chat');
       setTimeout(function () {
         isTourOpen && setCurrentTourStep && setCurrentTourStep(3);
       }, 1);
@@ -373,7 +381,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
       setIsTourFlag(false);
     }
     if (evt.keyCode === 39 && currentTourStep === 2) {
-      handleOpenMessages('chat');
+      handleShowOption('chat');
       setCurrentTourStep(3);
     }
     if (evt.keyCode === 39 && currentTourStep === 3) {
@@ -391,7 +399,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
   }, [isTourOpen, currentTourStep]);
   (0, _react.useEffect)(function () {
     if (!isTourFlag) return;
-    handleOpenMessages('chat');
+    handleShowOption('chat');
     setTimeout(function () {
       setCurrentTourStep(3);
     }, 1);
@@ -409,6 +417,8 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
       history: false
     });
     setShowOption(null);
+    var orderId = query.get('id');
+    history.replace("".concat(location.pathname, "?id=").concat(orderId));
   };
   (0, _react.useEffect)(function () {
     if (!open) return;
@@ -417,6 +427,13 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
       return document.removeEventListener('keydown', onCloseSidebar);
     };
   }, [open]);
+  (0, _react.useEffect)(function () {
+    if (loading) return;
+    var section = query.get('section');
+    if (section) {
+      handleShowOption(section, true);
+    }
+  }, [loading]);
   return /*#__PURE__*/_react.default.createElement(_styles2.Container, {
     isSelectedOrders: isSelectedOrders,
     id: "orderDetails",
@@ -467,7 +484,6 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
     showOption: showOption,
     openMessage: openMessages,
     handleShowOption: handleShowOption,
-    handleOpenMessages: handleOpenMessages,
     isTourOpen: isTourOpen,
     currentTourStep: currentTourStep,
     setIsTourOpen: setIsTourOpen,
@@ -494,7 +510,7 @@ var OrderDetailsUI = function OrderDetailsUI(props) {
     unreadAlert: unreadAlert,
     isTourOpen: isTourOpen,
     setCurrentTourStep: setCurrentTourStep,
-    handleOpenMessages: handleOpenMessages
+    handleShowOption: handleShowOption
   }), /*#__PURE__*/_react.default.createElement(_styles2.OrderProducts, null, /*#__PURE__*/_react.default.createElement("h2", null, t('EXPORT_SUMMARY', 'Summary')), (order === null || order === void 0 ? void 0 : (_order$products = order.products) === null || _order$products === void 0 ? void 0 : _order$products.length) && (order === null || order === void 0 ? void 0 : order.products.map(function (product) {
     return /*#__PURE__*/_react.default.createElement(_ProductItemAccordion.ProductItemAccordion, {
       key: product.id,

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

@@ -26,7 +26,6 @@ var OrderDetailsHeader = function OrderDetailsHeader(props) {
   var _order$payment_events, _order$payment_events2, _order$paymethod, _order$paymethod2;
   var order = props.order,
     handleShowOption = props.handleShowOption,
-    handleOpenMessages = props.handleOpenMessages,
     actionSidebar = props.actionSidebar,
     setIsTourOpen = props.setIsTourOpen,
     isTourOpen = props.isTourOpen,
@@ -76,7 +75,7 @@ var OrderDetailsHeader = function OrderDetailsHeader(props) {
     color: "black",
     active: openMessage === null || openMessage === void 0 ? void 0 : openMessage.chat,
     onClick: function onClick() {
-      return handleOpenMessages('chat');
+      return handleShowOption('chat');
     },
     isDisabled: isTourOpen && currentTourStep === 1
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Chat, null), (order === null || order === void 0 ? void 0 : order.unread_count) > 0 && /*#__PURE__*/_react.default.createElement(_styles2.UreadMessageAlert, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Dot, null))), /*#__PURE__*/_react.default.createElement(_reactToPrint.default, {
@@ -94,7 +93,7 @@ var OrderDetailsHeader = function OrderDetailsHeader(props) {
     color: "black",
     active: openMessage === null || openMessage === void 0 ? void 0 : openMessage.history,
     onClick: function onClick() {
-      return handleOpenMessages('history');
+      return handleShowOption('history');
     },
     isDisabled: isTourOpen && currentTourStep === 1
   }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Diagram3, null)), /*#__PURE__*/_react.default.createElement(_styles.IconButton, {

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

@@ -70,8 +70,8 @@ var OrdersContentHeader = function OrdersContentHeader(props) {
     if (Object.keys(filterValues).length === 0) {
       _filterApplied = false;
     } else {
-      var _filterValues$groupTy;
-      _filterApplied = (filterValues === null || filterValues === void 0 ? void 0 : (_filterValues$groupTy = filterValues.groupTypes) === null || _filterValues$groupTy === void 0 ? void 0 : _filterValues$groupTy.length) || filterValues.businessIds.length > 0 || filterValues.cityIds.length > 0 || filterValues.deliveryEndDatetime !== null || filterValues.deliveryFromDatetime !== null || filterValues.deliveryTypes.length > 0 || filterValues.driverIds.length > 0 || filterValues.paymethodIds.length > 0 || filterValues.statuses.length > 0;
+      var _filterValues$groupTy, _filterValues$metafie;
+      _filterApplied = (filterValues === null || filterValues === void 0 ? void 0 : (_filterValues$groupTy = filterValues.groupTypes) === null || _filterValues$groupTy === void 0 ? void 0 : _filterValues$groupTy.length) || filterValues.businessIds.length > 0 || filterValues.cityIds.length > 0 || filterValues.deliveryEndDatetime !== null || filterValues.deliveryFromDatetime !== null || filterValues.deliveryTypes.length > 0 || filterValues.driverIds.length > 0 || filterValues.paymethodIds.length > 0 || filterValues.statuses.length > 0 || (filterValues === null || filterValues === void 0 ? void 0 : (_filterValues$metafie = filterValues.metafield) === null || _filterValues$metafie === void 0 ? void 0 : _filterValues$metafie.length) > 0;
     }
     setFilterApplied(_filterApplied);
   }, [filterValues]);

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

@@ -5,21 +5,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OrdersFilterGroup = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _BusinessesSelector = require("../BusinessesSelector");
 var _DriversGroupTypeSelector = require("../DriversGroupTypeSelector");
 var _DateTypeSelector = require("../DateTypeSelector");
 var _DriverSelector = require("../DriverSelector");
 var _Shared = require("../../Shared");
-var _OrderStatusTypeSelector = require("../OrderStatusTypeSelector");
 var _DeliveryTypeSelector = require("../DeliveryTypeSelector");
 var _PaymethodTypeSelector = require("../PaymethodTypeSelector");
 var _CountryFilter = require("../CountryFilter");
 var _styles = require("../../../styles");
 var _CurrencyFilter = require("../CurrencyFilter");
+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; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -47,17 +49,31 @@ var OrdersFilterGroupUI = function OrdersFilterGroupUI(props) {
     handleChangeBusinesses = props.handleChangeBusinesses,
     handleChangeDriver = props.handleChangeDriver,
     handleChangeCity = props.handleChangeCity,
-    handleChangeOrderStatus = props.handleChangeOrderStatus,
     handleChangeDeliveryType = props.handleChangeDeliveryType,
     handleChangePaymethodType = props.handleChangePaymethodType,
     handleResetFilterValues = props.handleResetFilterValues,
     handleChangeFilterValues = props.handleChangeFilterValues,
     handleChangeOrderId = props.handleChangeOrderId,
     handleChangeCountryCode = props.handleChangeCountryCode,
-    handleChangeCurrency = props.handleChangeCurrency;
+    handleChangeCurrency = props.handleChangeCurrency,
+    handleChangeMetaFieldValue = props.handleChangeMetaFieldValue,
+    handleAddMetaField = props.handleAddMetaField,
+    handleDeleteMetafield = props.handleDeleteMetafield;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
+  var _useState = (0, _react.useState)({
+      key: '',
+      value: ''
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    metafield = _useState2[0],
+    setMetaField = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isShow = _useState4[0],
+    setIsShow = _useState4[1];
+  var metafieldRef = (0, _react.useRef)();
   var handleAcceptFilter = function handleAcceptFilter() {
     handleChangeFilterValues(filterValues);
     handleCloseFilterModal();
@@ -67,6 +83,35 @@ var OrdersFilterGroupUI = function OrdersFilterGroupUI(props) {
     // handleChangeFilterValues({})
   };
 
+  var handleAddMetafieldValue = function handleAddMetafieldValue() {
+    handleAddMetaField({
+      id: (0, _utils.getUniqueId)(),
+      key: metafield === null || metafield === void 0 ? void 0 : metafield.key,
+      value: metafield === null || metafield === void 0 ? void 0 : metafield.value
+    });
+    setMetaField({
+      key: '',
+      value: ''
+    });
+    setIsShow(false);
+  };
+  var handleDeleteMetafieldValue = function handleDeleteMetafieldValue(id) {
+    handleDeleteMetafield(id);
+  };
+  var handleClickOutside = function handleClickOutside(e) {
+    var _metafieldRef$current;
+    if (!isShow) return;
+    var outsideCalendar = !((_metafieldRef$current = metafieldRef.current) !== null && _metafieldRef$current !== void 0 && _metafieldRef$current.contains(e.target));
+    if (outsideCalendar) {
+      setIsShow(false);
+    }
+  };
+  (0, _react.useEffect)(function () {
+    window.addEventListener('mouseup', handleClickOutside);
+    return function () {
+      return window.removeEventListener('mouseup', handleClickOutside);
+    };
+  }, [isShow]);
   return /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
     width: "80%",
     padding: "0px",
@@ -84,6 +129,9 @@ var OrdersFilterGroupUI = function OrdersFilterGroupUI(props) {
     onChange: function onChange(e) {
       return handleChangeOrderId(e);
     }
+  }), /*#__PURE__*/_react.default.createElement(_CurrencyFilter.CurrencyFilter, {
+    filterValues: filterValues,
+    handleChangeCurrency: handleChangeCurrency
   })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, null, /*#__PURE__*/_react.default.createElement(_DriversGroupTypeSelector.DriversGroupTypeSelector, {
     driverGroupList: driverGroupList,
     handleChangeGroup: handleChangeGroup,
@@ -116,10 +164,65 @@ var OrdersFilterGroupUI = function OrdersFilterGroupUI(props) {
     paymethodsList: paymethodsList,
     filterValues: filterValues,
     handleChangePaymethodType: handleChangePaymethodType
-  })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, null, /*#__PURE__*/_react.default.createElement(_CurrencyFilter.CurrencyFilter, {
-    filterValues: filterValues,
-    handleChangeCurrency: handleChangeCurrency
-  })), /*#__PURE__*/_react.default.createElement(_styles2.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
+  })), filterValues === null || filterValues === void 0 ? void 0 : filterValues.metafield.map(function (item) {
+    return /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, {
+      key: item.id
+    }, /*#__PURE__*/_react.default.createElement(_styles.Input, {
+      type: "text",
+      name: "key",
+      placeholder: t('METAFIELD_NAME', 'Metafield name'),
+      autoComplete: "off",
+      value: item.key || '',
+      onChange: function onChange(e) {
+        return handleChangeMetaFieldValue(e, item.id);
+      }
+    }), (item === null || item === void 0 ? void 0 : item.key) && /*#__PURE__*/_react.default.createElement(_styles2.AddInputWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
+      type: "text",
+      name: "value",
+      placeholder: t('METAFIELD_VALUE', 'Metafield value'),
+      autoComplete: "off",
+      value: (item === null || item === void 0 ? void 0 : item.value) || '',
+      onChange: function onChange(e) {
+        return handleChangeMetaFieldValue(e, item.id);
+      }
+    }), /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
+      color: "black",
+      onClick: function onClick() {
+        return handleDeleteMetafieldValue(item.id);
+      }
+    }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.Trash3, null))));
+  }), !isShow && /*#__PURE__*/_react.default.createElement(_styles2.AddMetaFiled, {
+    onClick: function onClick() {
+      return setIsShow(true);
+    }
+  }, t('ADD_METAFIELD', 'Add a metafield')), isShow && /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, {
+    ref: metafieldRef
+  }, /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    type: "text",
+    name: "key",
+    placeholder: t('METAFIELD_NAME', 'Metafield name'),
+    autoComplete: "off",
+    value: metafield.key || '',
+    onChange: function onChange(e) {
+      return setMetaField(_objectSpread(_objectSpread({}, metafield), {}, {
+        key: e.target.value
+      }));
+    }
+  }), (metafield === null || metafield === void 0 ? void 0 : metafield.key) && /*#__PURE__*/_react.default.createElement(_styles2.AddInputWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
+    type: "text",
+    name: "value",
+    placeholder: t('METAFIELD_VALUE', 'Metafield value'),
+    autoComplete: "off",
+    value: metafield.value || '',
+    onChange: function onChange(e) {
+      return setMetaField(_objectSpread(_objectSpread({}, metafield), {}, {
+        value: e.target.value
+      }));
+    }
+  }), /*#__PURE__*/_react.default.createElement(_styles.IconButton, {
+    color: "primary",
+    onClick: handleAddMetafieldValue
+  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.PlusCircle, null)))), /*#__PURE__*/_react.default.createElement(_styles2.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
     color: "primary",
     borderRadius: "8px",
     onClick: function onClick() {

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

@@ -4,9 +4,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperRow = exports.MultiSelectContainer = exports.FilterGroupListContainer = exports.ButtonGroup = void 0;
+exports.WrapperRow = exports.MultiSelectContainer = exports.FilterGroupListContainer = exports.ButtonGroup = exports.AddMetaFiled = exports.AddInputWrapper = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -24,4 +24,12 @@ var ButtonGroup = _styledComponents.default.div(_templateObject4 || (_templateOb
   var _props$theme;
   return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n        margin-right: 20px;\n      "]))) : (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n        margin-left: 20px;\n      "])));
 });
-exports.ButtonGroup = ButtonGroup;
+exports.ButtonGroup = ButtonGroup;
+var AddInputWrapper = _styledComponents.default.div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  background-color: transparent !important;\n  input {\n    flex: 1;\n    height: 57px;\n  }\n  button {\n    width: 30px;\n    height: 30px;\n    margin-left: 10px;\n    ", "\n  }\n"])), function (props) {
+  return props.theme.rtl && (0, _styledComponents.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n      margin-right: 10px;\n      margin-left: 0;\n    "])));
+});
+exports.AddInputWrapper = AddInputWrapper;
+var AddMetaFiled = _styledComponents.default.span(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n  font-size: 14px;\n  color: ", ";\n  cursor: pointer;\n  width: 100%;\n"])), function (props) {
+  return props.theme.colors.primary;
+});
+exports.AddMetaFiled = AddMetaFiled;

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

@@ -187,7 +187,6 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
         handleBackRedirect();
       } else {
         setOrderDetailId(id);
-        onOrderRedirect && onOrderRedirect(id);
         setIsOpenOrderDetail(true);
       }
     }

package/_modules/components/Settings/CountriesList/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CountriesList = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
 var _Shared = require("../../Shared");
@@ -44,6 +45,8 @@ var CountriesList = function CountriesList(props) {
     selectedCountries = props.selectedCountries,
     setSelectedCountries = props.setSelectedCountries,
     handleDeleteCountry = props.handleDeleteCountry;
+  var history = (0, _reactRouterDom.useHistory)();
+  var query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -106,11 +109,15 @@ var CountriesList = function CountriesList(props) {
     setTotalPages(_totalPages);
     setCurrentCountries(_currentDropdownOptions);
   }, [countriesState, currentPage, countriesPerPage, searchValue]);
-  var handleClickCountry = function handleClickCountry(e, country) {
-    var isInvalid = e.target.closest('.country-checkbox') || e.target.closest('.country-enabled') || e.target.closest('.country-actions');
+  var handleClickCountry = function handleClickCountry(e, country, isInitialRender) {
+    var _e$target, _e$target2, _e$target3;
+    var isInvalid = (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.closest('.country-checkbox')) || (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.closest('.country-enabled')) || (e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.closest('.country-actions'));
     if (isInvalid) return;
     setSelectedCountry(country);
     setOpenDetails(true);
+    if (!isInitialRender) {
+      history.replace("".concat(location.pathname, "?country=").concat(country.id));
+    }
   };
   var onDeleteCountry = function onDeleteCountry(countryId) {
     setConfirm({
@@ -148,11 +155,28 @@ var CountriesList = function CountriesList(props) {
       setSelectedCountries([].concat(_toConsumableArray(selectedCountries), [country]));
     }
   };
+  var handleCloseDetail = function handleCloseDetail() {
+    setOpenDetails(false);
+    setSelectedCountry(null);
+    history.replace("".concat(location.pathname));
+  };
   (0, _react.useEffect)(function () {
     if (actionState.loading || actionState.error || selectedCountry) return;
     setOpenDetails(false);
     setSelectedCountry(null);
   }, [actionState]);
+  (0, _react.useEffect)(function () {
+    if (countriesState.loading) return;
+    var countryId = query.get('country');
+    if (countryId) {
+      var initCountry = countriesState.countries.find(function (country) {
+        return country.id === Number(countryId);
+      });
+      if (initCountry) {
+        handleClickCountry(null, initCountry, true);
+      }
+    }
+  }, [countriesState.loading]);
   return /*#__PURE__*/_react.default.createElement(_styles2.CountriesContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.CountryWrapper, {
     isHeader: true
   }, /*#__PURE__*/_react.default.createElement(_styles2.CountryName, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckboxWrapper, {
@@ -228,8 +252,7 @@ var CountriesList = function CountriesList(props) {
   })), openDetails && /*#__PURE__*/_react.default.createElement(_Shared.SideBar, {
     open: openDetails,
     onClose: function onClose() {
-      setOpenDetails(false);
-      setSelectedCountry(null);
+      return handleCloseDetail();
     },
     showExpandIcon: true
   }, /*#__PURE__*/_react.default.createElement(_CountryDetails.CountryDetails, {