ordering-ui-admin-external 1.43.75 → 1.43.77

package/_modules/components/Delivery/DriversGroupAddForm/AdvancedLogisticsForm/index.js

@@ -1,11 +1,10 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AdvancedLogisticsForm = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
 var _reactBootstrapIcons = require("react-bootstrap-icons");
 var _DriversGroupOrders = require("../../DriversGroupOrders");
@@ -13,8 +12,7 @@ var _DriversGroupAutoassign = require("../../DriversGroupAutoassign");
 var _DriversMarkAsBusy = require("../../DriversMarkAsBusy");
 var _styles = require("../../../../styles");
 var _styles2 = require("./styles");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -25,23 +23,12 @@ var AdvancedLogisticsForm = exports.AdvancedLogisticsForm = function AdvancedLog
   var _driversGroupState$dr, _driversGroupState$dr2, _driversGroupState$dr3, _driversGroupState$dr4;
   var driversGroupState = props.driversGroupState,
     changesState = props.changesState,
-    handleChangesState = props.handleChangesState;
+    handleChangesState = props.handleChangesState,
+    useAdvanced = props.useAdvanced,
+    handleLogistic = props.handleLogistic;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
-  var _useState = (0, _react.useState)(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    useAdvanced = _useState2[0],
-    setUseAdvanced = _useState2[1];
-  var handleLogistic = function handleLogistic(checked) {
-    setUseAdvanced(checked);
-    if (checked) return;
-    var changes = {
-      autoassign_amount_drivers: 0,
-      orders_group_max_orders: 0
-    };
-    handleChangesState(changes);
-  };
   return /*#__PURE__*/_react.default.createElement(_styles2.LogisticsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.HeaderWrapper, null, /*#__PURE__*/_react.default.createElement("h2", null, t('ADVANCED_LOGISTICS', 'Advanced logistics')), /*#__PURE__*/_react.default.createElement(_styles2.CheckboxContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
     checked: useAdvanced,
     onChange: function onChange(e) {

package/_modules/components/Delivery/DriversGroupDetails/index.js

@@ -37,7 +37,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
-  var _configState$configs, _driversGroupState$dr, _driversGroupState$dr2, _driversGroupState$dr3, _driversGroupState$dr4;
+  var _configState$configs, _driversGroupState$dr3, _driversGroupState$dr4, _driversGroupState$dr5, _driversGroupState$dr6;
   var driversGroupState = props.driversGroupState,
     actionState = props.actionState,
     handleParentSidebarMove = props.handleParentSidebarMove,
@@ -90,6 +90,7 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     isExpand = _useState12[0],
     setIsExpand = _useState12[1];
   (0, _react.useEffect)(function () {
+    var _driversGroupState$dr, _driversGroupState$dr2;
     var _driversGroupMenus = !driversGroupState.driversGroup ? [{
       key: 'general',
       value: t('GENERAL', 'General')
@@ -108,9 +109,6 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     }, {
       key: 'paymethods',
       value: t('PAYMENT_METHODS', 'Payment methods')
-    }, {
-      key: 'advanced_logistics',
-      value: t('ADVANCED_LOGISTICS', 'Advanced logistics')
     }, {
       key: 'logs',
       value: t('LOGS', 'Logs')
@@ -130,6 +128,13 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
       key: 'logs',
       value: t('LOGS', 'Logs')
     }];
+    var hideAdvancedLogistic = (driversGroupState === null || driversGroupState === void 0 || (_driversGroupState$dr = driversGroupState.driversGroup) === null || _driversGroupState$dr === void 0 ? void 0 : _driversGroupState$dr.autoassign_amount_drivers) === 0 && (driversGroupState === null || driversGroupState === void 0 || (_driversGroupState$dr2 = driversGroupState.driversGroup) === null || _driversGroupState$dr2 === void 0 ? void 0 : _driversGroupState$dr2.orders_group_max_orders) === 0;
+    if (autoAssignType !== 'basic' && !hideAdvancedLogistic) {
+      _driversGroupMenus.push({
+        key: 'advanced_logistics',
+        value: t('ADVANCED_LOGISTICS', 'Advanced logistics')
+      });
+    }
     setDriversGroupMenus(_driversGroupMenus);
   }, [driversGroupState === null || driversGroupState === void 0 ? void 0 : driversGroupState.driversGroup]);
   var onDeleteGroup = function onDeleteGroup() {
@@ -163,7 +168,7 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     handleParentSidebarMove(0);
     setIsOpenDetails(false);
     setIsExtendExtraOpen(false);
-  }, [showMenu, (_driversGroupState$dr = driversGroupState.driversGroup) === null || _driversGroupState$dr === void 0 ? void 0 : _driversGroupState$dr.id]);
+  }, [showMenu, (_driversGroupState$dr3 = driversGroupState.driversGroup) === null || _driversGroupState$dr3 === void 0 ? void 0 : _driversGroupState$dr3.id]);
   (0, _react.useEffect)(function () {
     if (!(actionState !== null && actionState !== void 0 && actionState.error)) return;
     setAlertState({
@@ -191,8 +196,8 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
   (0, _react.useEffect)(function () {
     setShowMenu('general');
   }, [driversGroupId]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DetailsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.Header, null, driversGroupState.driversGroup ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h1", null, (_driversGroupState$dr2 = driversGroupState.driversGroup) === null || _driversGroupState$dr2 === void 0 ? void 0 : _driversGroupState$dr2.name), /*#__PURE__*/_react.default.createElement(_styles.Switch, {
-    defaultChecked: (_driversGroupState$dr3 = driversGroupState.driversGroup) === null || _driversGroupState$dr3 === void 0 ? void 0 : _driversGroupState$dr3.enabled,
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.DetailsContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.Header, null, driversGroupState.driversGroup ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("h1", null, (_driversGroupState$dr4 = driversGroupState.driversGroup) === null || _driversGroupState$dr4 === void 0 ? void 0 : _driversGroupState$dr4.name), /*#__PURE__*/_react.default.createElement(_styles.Switch, {
+    defaultChecked: (_driversGroupState$dr5 = driversGroupState.driversGroup) === null || _driversGroupState$dr5 === void 0 ? void 0 : _driversGroupState$dr5.enabled,
     onChange: function onChange(enabled) {
       return handleUpdateDriversGroup({
         enabled: enabled
@@ -232,7 +237,7 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
   })), showMenu === 'advanced_logistics' && /*#__PURE__*/_react.default.createElement(_DriversGroupLogistics.DriversGroupLogistics, _extends({}, props, {
     curDriversGroup: driversGroupState.driversGroup
   })), showMenu === 'logs' && /*#__PURE__*/_react.default.createElement(_DriversGroupLogs.DriversGroupLogs, {
-    driversGroupId: (_driversGroupState$dr4 = driversGroupState.driversGroup) === null || _driversGroupState$dr4 === void 0 ? void 0 : _driversGroupState$dr4.id
+    driversGroupId: (_driversGroupState$dr6 = driversGroupState.driversGroup) === null || _driversGroupState$dr6 === void 0 ? void 0 : _driversGroupState$dr6.id
   }), showMenu === 'delivery_zones' && /*#__PURE__*/_react.default.createElement(_DriversGroupDeliveryDetails.DriverGroupDeliveryDetails, _extends({}, props, {
     curDriversGroup: driversGroupState.driversGroup,
     handleParentSidebarMove: handleParentSidebarMove,

package/_modules/components/Delivery/DriversGroupGeneralForm/index.js

@@ -36,7 +36,9 @@ var DriversGroupGeneralForm = exports.DriversGroupGeneralForm = function Drivers
     handleNextClick = props.handleNextClick,
     selectedDriverManager = props.selectedDriverManager,
     handleSelectDriverManager = props.handleSelectDriverManager,
-    handleChangeMaxDistance = props.handleChangeMaxDistance;
+    handleChangeMaxDistance = props.handleChangeMaxDistance,
+    useAdvanced = props.useAdvanced,
+    handleLogistic = props.handleLogistic;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -178,7 +180,12 @@ var DriversGroupGeneralForm = exports.DriversGroupGeneralForm = function Drivers
         type: val
       });
     }
-  })), (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 0 || typeof (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 'undefined' && ((_driversGroupState$dr4 = driversGroupState.driversGroup) === null || _driversGroupState$dr4 === void 0 ? void 0 : _driversGroupState$dr4.type) === 0 ? /*#__PURE__*/_react.default.createElement(_DriversGroupDrivers.DriversGroupDrivers, props) : /*#__PURE__*/_react.default.createElement(_DriversGroupCompanies.DriversGroupCompanies, props), /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, null, /*#__PURE__*/_react.default.createElement("label", null, t('PRIORITY', 'Priority')), /*#__PURE__*/_react.default.createElement(_styles.SecondSelect, {
+  })), /*#__PURE__*/_react.default.createElement(_styles2.CheckboxContainer, null, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
+    checked: useAdvanced,
+    onChange: function onChange(e) {
+      return handleLogistic(e.target.checked);
+    }
+  }), /*#__PURE__*/_react.default.createElement("p", null, t('USE_ADVANCED_LOGISTIC', 'Use advanced logistic'))), (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 0 || typeof (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 'undefined' && ((_driversGroupState$dr4 = driversGroupState.driversGroup) === null || _driversGroupState$dr4 === void 0 ? void 0 : _driversGroupState$dr4.type) === 0 ? /*#__PURE__*/_react.default.createElement(_DriversGroupDrivers.DriversGroupDrivers, props) : /*#__PURE__*/_react.default.createElement(_DriversGroupCompanies.DriversGroupCompanies, props), /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, null, /*#__PURE__*/_react.default.createElement("label", null, t('PRIORITY', 'Priority')), /*#__PURE__*/_react.default.createElement(_styles.SecondSelect, {
     isSecondIcon: true,
     placeholder: t('SELECT_PRIORITY', 'Select priority'),
     options: priorityOptions,

package/_modules/components/Delivery/DriversGroupGeneralForm/styles.js

@@ -4,10 +4,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperImage = exports.ManagerInfoContainer = exports.InputWrapper = exports.Image = exports.DriverManagerWrapper = exports.DriverManagerContainer = exports.Container = void 0;
+exports.WrapperImage = exports.ManagerInfoContainer = exports.InputWrapper = exports.Image = exports.DriverManagerWrapper = exports.DriverManagerContainer = exports.Container = exports.CheckboxContainer = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -41,4 +41,8 @@ var Image = exports.Image = function Image(props) {
       backgroundImage: "url(".concat(props.bgimage, ")")
     }
   }), props.children);
-};
+};
+var CheckboxContainer = exports.CheckboxContainer = _styledComponents.default.div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  margin: 0 0 29px 0;\n  p {\n    font-size: 14px;\n    margin: 0px;\n    ", "\n  }\n"])), function (props) {
+  var _props$theme;
+  return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n      padding-right: 10px;\n    "]))) : (0, _styledComponents.css)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n      padding-left: 10px;\n    "])));
+});

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

@@ -63,7 +63,9 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setAllowColumns = props.setAllowColumns,
     isUseQuery = props.isUseQuery,
     adminsList = props.adminsList,
-    assignableDriverGroupList = props.assignableDriverGroupList;
+    assignableDriverGroupList = props.assignableDriverGroupList,
+    mapsData = props.mapsData,
+    setMapsData = props.setMapsData;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -141,15 +143,6 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     _useState26 = _slicedToArray(_useState25, 2),
     ordersAmountByStatus = _useState26[0],
     setOrdersAmountByStatus = _useState26[1];
-  var _useState27 = (0, _react.useState)({
-      driversIsOnline: true,
-      onlineDrivers: [],
-      offlineDrivers: [],
-      selectedDriver: null
-    }),
-    _useState28 = _slicedToArray(_useState27, 2),
-    mapsData = _useState28[0],
-    setMapsData = _useState28[1];
   var handleBackRedirect = function handleBackRedirect() {
     setIsOpenOrderDetail(false);
     setDetailsOrder(null);

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

@@ -30,10 +30,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-var DeliveriesLocationPropsAreEqual = function DeliveriesLocationPropsAreEqual(prevProps, nextProps) {
-  return JSON.stringify(prevProps.interActionMapOrder) === JSON.stringify(nextProps.interActionMapOrder) && JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList);
-};
-var DeliveriesLocation = exports.DeliveriesLocation = /*#__PURE__*/_react.default.memo(function (props) {
+var DeliveriesLocation = exports.DeliveriesLocation = function DeliveriesLocation(props) {
   var _configState$configs, _configState$configs2, _configState$configs3, _interActionMapOrder$6, _interActionMapOrder$7, _interActionMapOrder$8, _interActionMapOrder$9, _interActionMapOrder$10, _interActionMapOrder$11, _interActionMapOrder$12, _interActionMapOrder$13, _interActionMapOrder$14;
   var driversList = props.driversList,
     interActionMapOrder = props.interActionMapOrder;
@@ -355,4 +352,4 @@ var DeliveriesLocation = exports.DeliveriesLocation = /*#__PURE__*/_react.defaul
       bgimage: (driver === null || driver === void 0 ? void 0 : driver.photo) || (theme === null || theme === void 0 || (_theme$images = theme.images) === null || _theme$images === void 0 || (_theme$images = _theme$images.icons) === null || _theme$images === void 0 ? void 0 : _theme$images.noDriver)
     })), /*#__PURE__*/_react.default.createElement(_styles.DriverInfo, null, /*#__PURE__*/_react.default.createElement("p", null, driver.name, " ", driver.lastname), /*#__PURE__*/_react.default.createElement("p", null, t('DRIVER', 'Driver'))));
   })))));
-}, DeliveriesLocationPropsAreEqual);
+};

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

@@ -21,11 +21,7 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-var DriversLocationPropsAreEqual = function DriversLocationPropsAreEqual(prevProps, nextProps) {
-  var _prevProps$offlineDri, _nextProps$offlineDri;
-  return JSON.stringify(prevProps.selectedDriver) === JSON.stringify(nextProps.selectedDriver) && JSON.stringify(prevProps.assignedOrders) === JSON.stringify(nextProps.assignedOrders) && prevProps.driversIsOnline === nextProps.driversIsOnline && JSON.stringify(prevProps.onlineDrivers) === JSON.stringify(nextProps.onlineDrivers) && JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList) && ((_prevProps$offlineDri = prevProps.offlineDrivers) === null || _prevProps$offlineDri === void 0 ? void 0 : _prevProps$offlineDri.length) === ((_nextProps$offlineDri = nextProps.offlineDrivers) === null || _nextProps$offlineDri === void 0 ? void 0 : _nextProps$offlineDri.length) && JSON.stringify(prevProps.selectedOrder) === JSON.stringify(nextProps.selectedOrder);
-};
-var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo(function (props) {
+var DriversLocation = exports.DriversLocation = function DriversLocation(props) {
   var _configState$configs, _configState$configs2, _configState$configs3, _selectedOrder$custom3, _selectedOrder$custom4, _selectedOrder$custom5, _selectedOrder$custom6, _selectedOrder$custom7, _selectedOrder$busine3, _selectedOrder$busine4, _selectedOrder$busine5, _selectedOrder$driver3, _selectedOrder$driver4, _selectedOrder$driver5, _selectedOrder$driver6, _selectedOrder$driver7, _selectedOrder$driver8, _selectedOrder$driver9, _selectedOrder$driver10, _selectedOrder$driver11, _selectedOrder$driver12, _selectedOrder$driver13, _selectedOrder$driver14, _assignedOrders$order6, _assignedOrders$order7;
   var driversIsOnline = props.driversIsOnline,
     onlineDrivers = props.onlineDrivers,
@@ -165,7 +161,7 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
     if (!mapFitted) {
       mapFit();
     }
-  }, [showDrivers, mapLoaded, mapFitted, selectedOrder, assignedOrders === null || assignedOrders === void 0 ? void 0 : assignedOrders.orders]);
+  }, [JSON.stringify(showDrivers), mapLoaded, mapFitted, selectedOrder, assignedOrders === null || assignedOrders === void 0 ? void 0 : assignedOrders.orders]);
   (0, _react.useEffect)(function () {
     if (selectedDriver) {
       setShowDrivers([selectedDriver]);
@@ -253,4 +249,4 @@ var DriversLocation = exports.DriversLocation = /*#__PURE__*/_react.default.memo
       image: order === null || order === void 0 || (_order$business5 = order.business) === null || _order$business5 === void 0 ? void 0 : _order$business5.logo
     });
   }))));
-}, DriversLocationPropsAreEqual);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.75",
+  "version": "1.43.77",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.43.49",
+    "ordering-components-admin-external": "1.43.51",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Delivery/DriversGroupAddForm/AdvancedLogisticsForm/index.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React from 'react'
 import { useLanguage } from 'ordering-components-admin-external'
 import { Circle, RecordCircleFill } from 'react-bootstrap-icons'
 import { DriversGroupOrders } from '../../DriversGroupOrders'
@@ -19,21 +19,12 @@ export const AdvancedLogisticsForm = (props) => {
   const {
     driversGroupState,
     changesState,
-    handleChangesState
+    handleChangesState,
+    useAdvanced,
+    handleLogistic
   } = props
 
   const [, t] = useLanguage()
-  const [useAdvanced, setUseAdvanced] = useState(false)
-
-  const handleLogistic = (checked) => {
-    setUseAdvanced(checked)
-    if (checked) return
-    const changes = {
-      autoassign_amount_drivers: 0,
-      orders_group_max_orders: 0
-    }
-    handleChangesState(changes)
-  }
 
   return (
     <LogisticsContainer>

package/src/components/Delivery/DriversGroupDetails/index.js

@@ -68,7 +68,6 @@ const DriversGroupDetailsUI = (props) => {
           { key: 'businesses', value: t('BUSINESSES', 'Businesses') },
           { key: 'delivery_zones', value: t('DELIVERY_ZONES', 'Delivery Zones') },
           { key: 'paymethods', value: t('PAYMENT_METHODS', 'Payment methods') },
-          { key: 'advanced_logistics', value: t('ADVANCED_LOGISTICS', 'Advanced logistics') },
           { key: 'logs', value: t('LOGS', 'Logs') }
         ]
         : [
@@ -78,6 +77,12 @@ const DriversGroupDetailsUI = (props) => {
           { key: 'paymethods', value: t('PAYMENT_METHODS', 'Payment methods') },
           { key: 'logs', value: t('LOGS', 'Logs') }
         ]
+    const hideAdvancedLogistic = driversGroupState?.driversGroup?.autoassign_amount_drivers === 0 &&
+      driversGroupState?.driversGroup?.orders_group_max_orders === 0
+
+    if (autoAssignType !== 'basic' && !hideAdvancedLogistic) {
+      _driversGroupMenus.push({ key: 'advanced_logistics', value: t('ADVANCED_LOGISTICS', 'Advanced logistics') })
+    }
     setDriversGroupMenus(_driversGroupMenus)
   }, [driversGroupState?.driversGroup])
 

package/src/components/Delivery/DriversGroupGeneralForm/index.js

@@ -7,6 +7,7 @@ import { DriversGroupDrivers } from '../DriversGroupDrivers'
 import { DriversGroupCompanies } from '../DriversGroupCompanies'
 
 import {
+  CheckboxContainer,
   Container,
   DriverManagerContainer,
   DriverManagerWrapper,
@@ -30,7 +31,9 @@ export const DriversGroupGeneralForm = (props) => {
     handleNextClick,
     selectedDriverManager,
     handleSelectDriverManager,
-    handleChangeMaxDistance
+    handleChangeMaxDistance,
+    useAdvanced,
+    handleLogistic
   } = props
 
   const [, t] = useLanguage()
@@ -178,7 +181,13 @@ export const DriversGroupGeneralForm = (props) => {
           onChange={val => handleChangesState({ type: val })}
         />
       </InputWrapper>
-
+      <CheckboxContainer>
+        <Checkbox
+          checked={useAdvanced}
+          onChange={e => handleLogistic(e.target.checked)}
+        />
+        <p>{t('USE_ADVANCED_LOGISTIC', 'Use advanced logistic')}</p>
+      </CheckboxContainer>
       {
         (changesState?.type === 0 || (typeof changesState?.type === 'undefined' && driversGroupState.driversGroup?.type === 0))
           ? <DriversGroupDrivers {...props} />

package/src/components/Delivery/DriversGroupGeneralForm/styles.js

@@ -125,3 +125,20 @@ export const Image = (props) => {
     </ImageStyled>
   )
 }
+
+export const CheckboxContainer = styled.div`
+  display: flex;
+  align-items: center;
+  margin: 0 0 29px 0;
+  p {
+    font-size: 14px;
+    margin: 0px;
+    ${props => props.theme?.rtl
+? css`
+      padding-right: 10px;
+    `
+: css`
+      padding-left: 10px;
+    `}
+  }
+`

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

@@ -58,7 +58,9 @@ const OrdersManagerUI = (props) => {
     setAllowColumns,
     isUseQuery,
     adminsList,
-    assignableDriverGroupList
+    assignableDriverGroupList,
+    mapsData,
+    setMapsData
   } = props
 
   const [, t] = useLanguage()
@@ -88,13 +90,6 @@ const OrdersManagerUI = (props) => {
     cancelled: null
   })
 
-  const [mapsData, setMapsData] = useState({
-    driversIsOnline: true,
-    onlineDrivers: [],
-    offlineDrivers: [],
-    selectedDriver: null
-  })
-
   const handleBackRedirect = () => {
     setIsOpenOrderDetail(false)
     setDetailsOrder(null)

package/src/components/Orders/DeliveriesLocation/index.js

@@ -16,12 +16,7 @@ import {
   DriverInfo
 } from './styles'
 
-const DeliveriesLocationPropsAreEqual = (prevProps, nextProps) => {
-  return JSON.stringify(prevProps.interActionMapOrder) === JSON.stringify(nextProps.interActionMapOrder) &&
-    JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList)
-}
-
-export const DeliveriesLocation = React.memo((props) => {
+export const DeliveriesLocation = (props) => {
   const {
     driversList,
     interActionMapOrder
@@ -307,4 +302,4 @@ export const DeliveriesLocation = React.memo((props) => {
       )}
     </WrapperMap>
   )
-}, DeliveriesLocationPropsAreEqual)
+}

package/src/components/Orders/DriversLocation/index.js

@@ -9,17 +9,7 @@ import {
   WrapperMap
 } from './styles'
 
-const DriversLocationPropsAreEqual = (prevProps, nextProps) => {
-  return JSON.stringify(prevProps.selectedDriver) === JSON.stringify(nextProps.selectedDriver) &&
-    JSON.stringify(prevProps.assignedOrders) === JSON.stringify(nextProps.assignedOrders) &&
-    prevProps.driversIsOnline === nextProps.driversIsOnline &&
-    JSON.stringify(prevProps.onlineDrivers) === JSON.stringify(nextProps.onlineDrivers) &&
-    JSON.stringify(prevProps.driversList) === JSON.stringify(nextProps.driversList) &&
-    prevProps.offlineDrivers?.length === nextProps.offlineDrivers?.length &&
-    JSON.stringify(prevProps.selectedOrder) === JSON.stringify(nextProps.selectedOrder)
-}
-
-export const DriversLocation = React.memo((props) => {
+export const DriversLocation = (props) => {
   const {
     driversIsOnline,
     onlineDrivers,
@@ -122,7 +112,6 @@ export const DriversLocation = React.memo((props) => {
         lng: bounds.getSouthWest().lng()
       }
     }
-
     const mapSize = {
       width: mapRef.current.clientWidth,
       height: mapRef.current.clientHeight
@@ -149,7 +138,7 @@ export const DriversLocation = React.memo((props) => {
     if (!mapFitted) {
       mapFit()
     }
-  }, [showDrivers, mapLoaded, mapFitted, selectedOrder, assignedOrders?.orders])
+  }, [JSON.stringify(showDrivers), mapLoaded, mapFitted, selectedOrder, assignedOrders?.orders])
 
   useEffect(() => {
     if (selectedDriver) {
@@ -278,4 +267,4 @@ export const DriversLocation = React.memo((props) => {
       </WrapperMap>
     </>
   )
-}, DriversLocationPropsAreEqual)
+}