ordering-ui-admin-external 1.27.1 → 1.28.1

package/_modules/components/BusinessIntelligence/AnalyticsOrdersStatus/index.js

@@ -106,8 +106,9 @@ var AnalyticsOrdersStatus = function AnalyticsOrdersStatus(props) {
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _orderStatus$label$st;
         var label = _step.value;
-        labels.push(orderStatus[label.status].value);
+        labels.push(orderStatus === null || orderStatus === void 0 ? void 0 : (_orderStatus$label$st = orderStatus[label.status]) === null || _orderStatus$label$st === void 0 ? void 0 : _orderStatus$label$st.value);
       }
     } catch (err) {
       _iterator.e(err);

package/_modules/components/BusinessIntelligence/BusinessAnalytics/index.js

@@ -175,19 +175,10 @@ var BusinessAnalyticsUI = function BusinessAnalyticsUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var BusinessAnalytics = function BusinessAnalytics(props) {
   var businessAnalyticsProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/CountryFilter/index.js

@@ -37,7 +37,10 @@ var CountryFilterUI = function CountryFilterUI(props) {
     _onSearch = props.onSearch,
     handleClickFilterButton = props.handleClickFilterButton,
     code = props.code,
-    setCode = props.setCode;
+    openCountryFilter = props.openCountryFilter,
+    setOpenCountryFilter = props.setOpenCountryFilter,
+    setCode = props.setCode,
+    actionState = props.actionState;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -81,7 +84,15 @@ var CountryFilterUI = function CountryFilterUI(props) {
     setTotalPages(_totalPages);
     setCurrentPages(_currentBusinessList);
   }, [countriesState, currentPage, pagesPerPage]);
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement("h2", null, t('CHOOSE_A_COUNTRY', 'Choose a country')), /*#__PURE__*/_react.default.createElement(_styles2.SearchWrapper, null, /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(countriesState !== null && countriesState !== void 0 && countriesState.loading) && (currentPages === null || currentPages === void 0 ? void 0 : currentPages.length) > 0 && /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
+    width: "450px",
+    height: "650px",
+    padding: "25px",
+    open: openCountryFilter,
+    onClose: function onClose() {
+      return setOpenCountryFilter(false);
+    }
+  }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.Container, null, /*#__PURE__*/_react.default.createElement("h2", null, t('CHOOSE_A_COUNTRY', 'Choose a country')), /*#__PURE__*/_react.default.createElement(_styles2.SearchWrapper, null, /*#__PURE__*/_react.default.createElement(_Shared.SearchBar, {
     search: searchValue,
     isCustomLayout: true,
     lazyLoad: true,
@@ -89,7 +100,7 @@ var CountryFilterUI = function CountryFilterUI(props) {
       return _onSearch(value);
     },
     placeholder: t('SEARCH', 'Search')
-  })), /*#__PURE__*/_react.default.createElement(_styles2.CountryListWrapper, null, countriesState !== null && countriesState !== void 0 && countriesState.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, _toConsumableArray(Array(10).keys()).map(function (i) {
+  })), /*#__PURE__*/_react.default.createElement(_styles2.CountryListWrapper, null, actionState !== null && actionState !== void 0 && actionState.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, _toConsumableArray(Array(10).keys()).map(function (i) {
     return /*#__PURE__*/_react.default.createElement(_styles2.CountryItem, {
       key: i
     }, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
@@ -124,11 +135,14 @@ var CountryFilterUI = function CountryFilterUI(props) {
     color: "primary",
     disabled: countriesState.loading,
     onClick: handleClickFilterButton
-  }, t('FILTER', 'Filter'))));
+  }, t('FILTER', 'Filter'))))));
 };
 var CountryFilter = function CountryFilter(props) {
   var countryFilterProps = _objectSpread(_objectSpread({}, props), {}, {
     UIComponent: CountryFilterUI,
+    onClose: function onClose() {
+      return props.setOpenCountryFilter(false);
+    },
     isSearchByName: true
   });
   return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.CountryList, countryFilterProps);

package/_modules/components/BusinessIntelligence/DriverAnalytics/index.js

@@ -221,19 +221,10 @@ var DriverAnalyticsUI = function DriverAnalyticsUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var DriverAnalytics = function DriverAnalytics(props) {
   var driverAnalyticsProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsBusinessDistance/index.js

@@ -267,19 +267,10 @@ var ReportsBusinessDistanceUI = function ReportsBusinessDistanceUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsBusinessDistance = function ReportsBusinessDistance(props) {
   var reportsBusinessDistanceProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsBusinessSpend/index.js

@@ -211,19 +211,10 @@ var ReportsBusinessSpendUI = function ReportsBusinessSpendUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsBusinessSpend = function ReportsBusinessSpend(props) {
   var reportsBusinessSpendProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsDriverDistance/index.js

@@ -245,19 +245,10 @@ var ReportsDriverDistanceUI = function ReportsDriverDistanceUI(props) {
       return setIsDriverGroupFilter(false);
     },
     setAvailableDriverIds: setAvailableDriverIds
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  })))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  }))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('DRIVER_SCHEDULE', 'Driver schedule'),
     content: alertState.content,
     acceptText: t('ACCEPT', 'Accept'),

package/_modules/components/BusinessIntelligence/ReportsDriverOrder/index.js

@@ -193,19 +193,10 @@ var ReportsDriverOrderUI = function ReportsDriverOrderUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsDriverOrder = function ReportsDriverOrder(props) {
   var reportsDriverOrderProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsDriverOrderTime/index.js

@@ -212,19 +212,10 @@ var ReportsDriverOrderTimeUI = function ReportsDriverOrderTimeUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsDriverOrderTime = function ReportsDriverOrderTime(props) {
   var reportsDriverOrderProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsDriverSpend/index.js

@@ -211,19 +211,10 @@ var ReportsDriverSpendUI = function ReportsDriverSpendUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsDriverSpend = function ReportsDriverSpend(props) {
   var reportsBusinessSpendProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsGeneralSales/index.js

@@ -233,19 +233,10 @@ var ReportsGeneralSalesUI = function ReportsGeneralSalesUI(props) {
       return setIsBusinessFilter(false);
     },
     isFranchise: true
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsGeneralSales = function ReportsGeneralSales(props) {
   var reportsPaymethodSalesProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsHeatMap/index.js

@@ -230,19 +230,10 @@ var ReportsHeatMapUI = function ReportsHeatMapUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  })))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  }))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('HEAT_MAP', 'Heat map'),
     content: alertState.content,
     acceptText: t('ACCEPT', 'Accept'),

package/_modules/components/BusinessIntelligence/ReportsOrderDistance/index.js

@@ -256,19 +256,10 @@ var ReportsOrderDistanceUI = function ReportsOrderDistanceUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsOrderDistance = function ReportsOrderDistance(props) {
   var reportsOrderDistanceProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsOrderStatus/index.js

@@ -279,19 +279,10 @@ var ReportsOrderStatusUI = function ReportsOrderStatusUI(props) {
     onClose: function onClose() {
       return setIsOrderTypeFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  })))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  }))), /*#__PURE__*/_react.default.createElement(_Shared.Alert, {
     title: t('DRIVER_SCHEDULE', 'Driver schedule'),
     content: alertState.content,
     acceptText: t('ACCEPT', 'Accept'),

package/_modules/components/BusinessIntelligence/ReportsOrders/index.js

@@ -230,19 +230,10 @@ var ReportsOrdersUI = function ReportsOrdersUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsOrders = function ReportsOrders(props) {
   var reportOrdersProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsSaleAndCategory/index.js

@@ -260,19 +260,10 @@ var ReportsSaleAndCategoryUI = function ReportsSaleAndCategoryUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsSaleAndCategory = function ReportsSaleAndCategory(props) {
   var reportsSaleAndCategoryProps = _objectSpread(_objectSpread({}, props), {}, {

package/_modules/components/BusinessIntelligence/ReportsSales/index.js

@@ -235,19 +235,10 @@ var ReportsSalesUI = function ReportsSalesUI(props) {
     onClose: function onClose() {
       return setIsBrandFilter(false);
     }
-  }))), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
-    width: "450px",
-    height: "650px",
-    padding: "25px",
-    open: openCountryFilter,
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
-    onClose: function onClose() {
-      return setOpenCountryFilter(false);
-    }
-  }))));
+  }))), /*#__PURE__*/_react.default.createElement(_CountryFilter.CountryFilter, _extends({}, props, {
+    openCountryFilter: openCountryFilter,
+    setOpenCountryFilter: setOpenCountryFilter
+  })));
 };
 var ReportsSales = function ReportsSales(props) {
   var reportOrdersProps = _objectSpread(_objectSpread({}, props), {}, {

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

@@ -22,7 +22,8 @@ var GeneralForm = function GeneralForm(props) {
   var _changesState$name;
   var driversManagers = props.driversManagers,
     changesState = props.changesState,
-    handleChangesState = props.handleChangesState;
+    handleChangesState = props.handleChangesState,
+    handleChangeType = props.handleChangeType;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -87,9 +88,7 @@ var GeneralForm = function GeneralForm(props) {
     options: typeOptions,
     defaultValue: changesState === null || changesState === void 0 ? void 0 : changesState.type,
     onChange: function onChange(val) {
-      return handleChangesState({
-        type: val
-      });
+      return handleChangeType(val);
     }
   })), (changesState === null || changesState === void 0 ? void 0 : changesState.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,

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

@@ -36,7 +36,7 @@ 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 DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
-  var _configState$configs, _configState$configs$, _driversGroupState$dr3, _driversGroupState$dr4, _driversGroupState$dr5, _driversGroupState$dr6;
+  var _configState$configs, _configState$configs$, _driversGroupState$dr, _driversGroupState$dr2, _driversGroupState$dr3, _driversGroupState$dr4;
   var driversGroupState = props.driversGroupState,
     actionState = props.actionState,
     handleParentSidebarMove = props.handleParentSidebarMove,
@@ -62,37 +62,33 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     _useState2 = _slicedToArray(_useState, 2),
     showMenu = _useState2[0],
     setShowMenu = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    useAdvanced = _useState4[0],
-    setUseAdvanced = _useState4[1];
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    driversGroupMenus = _useState6[0],
-    setDriversGroupMenus = _useState6[1];
-  var _useState7 = (0, _react.useState)({
+    driversGroupMenus = _useState4[0],
+    setDriversGroupMenus = _useState4[1];
+  var _useState5 = (0, _react.useState)({
       open: false,
       content: null,
       handleOnAccept: null
     }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    confirm = _useState8[0],
-    setConfirm = _useState8[1];
-  var _useState9 = (0, _react.useState)({
+    _useState6 = _slicedToArray(_useState5, 2),
+    confirm = _useState6[0],
+    setConfirm = _useState6[1];
+  var _useState7 = (0, _react.useState)({
       open: false,
       content: []
     }),
+    _useState8 = _slicedToArray(_useState7, 2),
+    alertState = _useState8[0],
+    setAlertState = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    alertState = _useState10[0],
-    setAlertState = _useState10[1];
+    isOpenDetails = _useState10[0],
+    setIsOpenDetails = _useState10[1];
   var _useState11 = (0, _react.useState)(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    isOpenDetails = _useState12[0],
-    setIsOpenDetails = _useState12[1];
-  var _useState13 = (0, _react.useState)(false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    isExpand = _useState14[0],
-    setIsExpand = _useState14[1];
+    isExpand = _useState12[0],
+    setIsExpand = _useState12[1];
   (0, _react.useEffect)(function () {
     var _driversGroupMenus = !driversGroupState.driversGroup ? [{
       key: 'general',
@@ -100,7 +96,7 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     }, {
       key: 'businesses',
       value: t('BUSINESSES', 'Businesses')
-    }] : useAdvanced && autoAssignType !== 'basic' ? [{
+    }] : autoAssignType !== 'basic' ? [{
       key: 'general',
       value: t('GENERAL', 'General')
     }, {
@@ -135,7 +131,7 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
       value: t('LOGS', 'Logs')
     }];
     setDriversGroupMenus(_driversGroupMenus);
-  }, [useAdvanced, driversGroupState === null || driversGroupState === void 0 ? void 0 : driversGroupState.driversGroup]);
+  }, [driversGroupState === null || driversGroupState === void 0 ? void 0 : driversGroupState.driversGroup]);
   var onDeleteGroup = function onDeleteGroup() {
     setConfirm({
       open: true,
@@ -163,15 +159,11 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
       return !prev;
     });
   };
-  (0, _react.useEffect)(function () {
-    var _driversGroupState$dr, _driversGroupState$dr2;
-    setUseAdvanced(!(((_driversGroupState$dr = driversGroupState.driversGroup) === null || _driversGroupState$dr === void 0 ? void 0 : _driversGroupState$dr.autoassign_amount_drivers) === 0 && ((_driversGroupState$dr2 = driversGroupState.driversGroup) === null || _driversGroupState$dr2 === void 0 ? void 0 : _driversGroupState$dr2.orders_group_max_orders) === 0));
-  }, [driversGroupState.driversGroup]);
   (0, _react.useEffect)(function () {
     handleParentSidebarMove(0);
     setIsOpenDetails(false);
     setIsExtendExtraOpen(false);
-  }, [showMenu, (_driversGroupState$dr3 = driversGroupState.driversGroup) === null || _driversGroupState$dr3 === void 0 ? void 0 : _driversGroupState$dr3.id]);
+  }, [showMenu, (_driversGroupState$dr = driversGroupState.driversGroup) === null || _driversGroupState$dr === void 0 ? void 0 : _driversGroupState$dr.id]);
   (0, _react.useEffect)(function () {
     if (!(actionState !== null && actionState !== void 0 && actionState.error)) return;
     setAlertState({
@@ -198,8 +190,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$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,
+  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,
     onChange: function onChange(enabled) {
       return handleUpdateDriversGroup({
         enabled: enabled
@@ -231,8 +223,6 @@ var DriversGroupDetailsUI = function DriversGroupDetailsUI(props) {
     }, menu.value);
   }))), showMenu === 'general' && /*#__PURE__*/_react.default.createElement(_DriversGroupGeneralForm.DriversGroupGeneralForm, _extends({}, props, {
     curDriversGroup: driversGroupState.driversGroup,
-    useAdvanced: useAdvanced,
-    setUseAdvanced: setUseAdvanced,
     handleNextClick: handleNextClick
   })), showMenu === 'businesses' && /*#__PURE__*/_react.default.createElement(_DriversGroupBusinesses.DriversGroupBusinesses, _extends({}, props, {
     curDriversGroup: driversGroupState.driversGroup
@@ -241,7 +231,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$dr6 = driversGroupState.driversGroup) === null || _driversGroupState$dr6 === void 0 ? void 0 : _driversGroupState$dr6.id
+    driversGroupId: (_driversGroupState$dr4 = driversGroupState.driversGroup) === null || _driversGroupState$dr4 === void 0 ? void 0 : _driversGroupState$dr4.id
   }), showMenu === 'delivery_zones' && /*#__PURE__*/_react.default.createElement(_DriversGroupDeliveryDetails.DriverGroupDeliveryDetails, _extends({}, props, {
     curDriversGroup: driversGroupState.driversGroup,
     handleParentSidebarMove: handleParentSidebarMove,