ordering-ui-admin-external 1.43.64 → 1.43.66

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

@@ -4,20 +4,20 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WrapperStar = exports.WrapperImage = exports.Timestatus = exports.Image = exports.DriversListContainer = exports.DriverInfo = exports.DriverCard = void 0;
+exports.WrapperStar = exports.WrapperImage = exports.Timestatus = exports.PaginationWrapper = exports.Image = exports.DriversListContainer = exports.DriverInfo = exports.DriverCard = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21;
 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(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var DriversListContainer = exports.DriversListContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 15px 0px;\n  @media (min-width: 992px) {\n    ", "\n  }\n"])), function (_ref) {
+var DriversListContainer = exports.DriversListContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  padding: 15px 0px;\n  position: relative;\n  @media (min-width: 992px) {\n    ", "\n  }\n"])), function (_ref) {
   var showCompressedInfo = _ref.showCompressedInfo;
   return showCompressedInfo && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n      padding: 0px 0px;\n    "])));
 });
-var DriverCard = exports.DriverCard = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  min-height: 66px;\n  cursor: pointer;\n  display: flex;\n  align-items: center;\n  position: relative;\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: 8px;\n  margin-bottom: 20px;\n  padding: 10px 15px;\n\n  &:hover {\n    background-color: ", ";\n  }\n  \n  ", "\n\n  @media (min-width: 992px) {\n    ", "\n  }\n"])), function (props) {
+var DriverCard = exports.DriverCard = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  min-height: 66px;\n  cursor: pointer;\n  display: flex;\n  align-items: center;\n  position: relative;\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  border-radius: 8px;\n  margin-bottom: 20px;\n  padding: 10px 15px;\n\n  &:hover {\n    background-color: ", ";\n  }\n\n  ", "\n\n  @media (min-width: 992px) {\n    ", "\n  }\n"])), function (props) {
   return props.theme.colors.borderColor;
 }, function (props) {
   return props.theme.colors.lightPrimary;
@@ -75,4 +75,5 @@ var Timestatus = exports.Timestatus = _styledComponents.default.div(_templateObj
 }, function (_ref9) {
   var timeState = _ref9.timeState;
   return timeState === 'delayed' && (0, _styledComponents.css)(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n    background-color: #E63757;\n  "])));
-});
+});
+var PaginationWrapper = exports.PaginationWrapper = _styledComponents.default.div(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n  position: sticky;\n  bottom: 0px;\n  background: #fff;\n  justify-content: center;\n  > div {\n    padding: 10px 5px 0px 5px;\n  }\n"])));

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

@@ -19,7 +19,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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(arr) { if (Array.isArray(arr)) return arr; }
-var InterActOrderMarker = exports.InterActOrderMarker = function InterActOrderMarker(props) {
+var InterActOrderMarkerPropsAreEqual = function InterActOrderMarkerPropsAreEqual(prevProps, nextProps) {
+  return prevProps.image === nextProps.image && JSON.stringify(prevProps.customer) === JSON.stringify(nextProps.customer) && JSON.stringify(prevProps.business) === JSON.stringify(nextProps.business) && prevProps.timeStatus === nextProps.timeStatus && JSON.stringify(prevProps.driver) === JSON.stringify(nextProps.driver);
+};
+var InterActOrderMarker = exports.InterActOrderMarker = /*#__PURE__*/_react.default.memo(function (props) {
   var _driver$drivergroups, _theme$images;
   var image = props.image,
     customer = props.customer,
@@ -92,4 +95,4 @@ var InterActOrderMarker = exports.InterActOrderMarker = function InterActOrderMa
   }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, customer && /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null), driver && /*#__PURE__*/_react.default.createElement(_styles.MapMarkerImg, {
     bgimage: 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
   }))));
-};
+}, InterActOrderMarkerPropsAreEqual);

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

@@ -36,6 +36,7 @@ var OrdersContentHeader = exports.OrdersContentHeader = function OrdersContentHe
     handleChangeSearch = props.handleChangeSearch,
     searchValue = props.searchValue,
     driverGroupList = props.driverGroupList,
+    assignableDriverGroupList = props.assignableDriverGroupList,
     driversList = props.driversList,
     citiesList = props.citiesList,
     paymethodsList = props.paymethodsList,
@@ -84,6 +85,7 @@ var OrdersContentHeader = exports.OrdersContentHeader = function OrdersContentHe
   }, /*#__PURE__*/_react.default.createElement(_styles2.WrapperHeaderFilterGroup, null, /*#__PURE__*/_react.default.createElement(_OrdersHeaderFilterGroup.OrdersHeaderFilterGroup, {
     isSelectedOrders: isSelectedOrders,
     driverGroupList: driverGroupList,
+    assignableDriverGroupList: assignableDriverGroupList,
     driversList: driversList,
     searchValue: searchValue,
     handleChangeFilterValues: handleChangeFilterValues,

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

@@ -49,7 +49,8 @@ var OrdersDashboardList = exports.OrdersDashboardList = function OrdersDashboard
     isSearchByCustomerPhone: isShowSearchFilters,
     isSearchByDriverName: isShowSearchFilters,
     isSearchByBusinessName: true,
-    driverId: props.driverId
+    driverId: props.driverId,
+    getDriversByControls: true
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isMessagesView ? /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.DashboardOrdersList, _extends({
     isMessagesView: true

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

@@ -275,8 +275,8 @@ var OrdersFilterGroupUI = function OrdersFilterGroupUI(props) {
     }
   })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, null, /*#__PURE__*/_react.default.createElement(_DriversGroupTypeSelector.DriversGroupTypeSelector, {
     driverGroupList: driverGroupList,
-    handleChangeGroup: handleChangeGroup,
-    filterValues: filterValues.groupTypes,
+    handleChangeGroup: handleChangeGroupUnassigned,
+    filterValues: filterValues.groupTypesUnassigned,
     title: t('DRIVER_GROUP_ASSIGNED', 'Driver group (assigned)')
   }), /*#__PURE__*/_react.default.createElement(_BusinessesSelector.BusinessesSelector, {
     filterValues: filterValues,

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

@@ -27,17 +27,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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(arr) { if (Array.isArray(arr)) return arr; }
 var OrdersHeaderFilterGroupUI = function OrdersHeaderFilterGroupUI(props) {
-  var _configs$filter_order, _dictionary$EXTERNAL_;
+  var _configs$filter_order, _dictionary$EXTERNAL_, _dictionary$DRIVER_GR;
   var filterValues = props.filterValues,
-    searchValue = props.searchValue,
-    driverGroupList = props.driverGroupList,
     driversList = props.driversList,
     handleChangeDriver = props.handleChangeDriver,
     handleChangeFilterValues = props.handleChangeFilterValues,
     handleChangeExternalId = props.handleChangeExternalId,
-    handleChangeGroupUnassigned = props.handleChangeGroupUnassigned,
-    handleChangeSearch = props.handleChangeSearch,
-    isSelectedOrders = props.isSelectedOrders;
+    handleChangeGroup = props.handleChangeGroup,
+    isSelectedOrders = props.isSelectedOrders,
+    assignableDriverGroupList = props.assignableDriverGroupList;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 1),
     dictionary = _useLanguage2[0].dictionary;
@@ -105,22 +103,11 @@ var OrdersHeaderFilterGroupUI = function OrdersHeaderFilterGroupUI(props) {
     drivers: driversList.drivers,
     filterValues: filterValues,
     handleChangeDriver: handleChangeDriver
-  }), !loading && configFilter.includes('driver_group_general') &&
-  /*#__PURE__*/
-  // <DriversGroupTypeSelector
-  //   driverGroupList={driverGroupList}
-  //   handleChangeGroup={handleChangeGroupUnassigned}
-  //   filterValues={filterValues.groupTypesUnassigned}
-  //   title={dictionary?.DRIVER_GROUP_NOT_ASSIGNED ?? 'Driver group (general)'}
-  // />
-  _react.default.createElement(_Shared.SearchBar, {
-    customClass: "external_id",
-    isCustomLayout: true,
-    hideSearchIcon: true,
-    lazyLoad: true,
-    onSearch: handleChangeSearch,
-    search: searchValue || '',
-    placeholder: (dictionary === null || dictionary === void 0 ? void 0 : dictionary.SEARCH_BY_STORE_NAME) || 'Store name'
+  }), !loading && configFilter.includes('driver_group') && /*#__PURE__*/_react.default.createElement(_DriversGroupTypeSelector.DriversGroupTypeSelector, {
+    driverGroupList: assignableDriverGroupList,
+    handleChangeGroup: handleChangeGroup,
+    filterValues: filterValues.driverGroupBusinessIds,
+    title: (_dictionary$DRIVER_GR = dictionary === null || dictionary === void 0 ? void 0 : dictionary.DRIVER_GROUP_ASSIGNABLE) !== null && _dictionary$DRIVER_GR !== void 0 ? _dictionary$DRIVER_GR : 'Driver group (assignable)'
   })));
 };
 var OrdersHeaderFilterGroup = exports.OrdersHeaderFilterGroup = function OrdersHeaderFilterGroup(props) {

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

@@ -10,7 +10,7 @@ var _templateObject, _templateObject2, _templateObject3;
 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-var WrapperRow = exports.WrapperRow = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  align-items: center;\n  padding-bottom: 0px;\n\n  & > div {\n    width: 100%;\n    height: 47px;\n    max-width: 1000px;\n    margin-right: 10px;\n    background-color: ", ";\n    border: none;\n    font-size: 14px;\n    border-radius: 8px;\n    > div:first-child {\n      height: 100%;\n    }\n  }\n\n  .order-status-multi-select {\n    p {\n      padding: 0;\n      color: ", " !important;\n    }\n  }\n\n  .date-filter-container {\n    z-index: 100;\n  }\n\n  input {\n    width: 100%;\n    height: 47px;\n    padding: 10px 25px;\n    box-sizing: border-box;\n    &::-webkit-outer-spin-button,\n    &::-webkit-inner-spin-button {\n      -webkit-appearance: none;\n      margin: 0;\n    }\n    -moz-appearance: textfield;\n  }\n\n  .close {\n    right: 8px;\n  }\n\n  .external_id {\n    @media (max-width: 1200px) {\n     flex: auto;\n    }\n  }\n\n  @media (max-width: 798px) {\n    flex-direction: column !important;\n    padding: 10px 15px 0 0px;\n    & > div {\n      margin-top: 15px;\n    }\n  }\n\n  ", "\n"])), function (props) {
+var WrapperRow = exports.WrapperRow = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  width: 100%;\n  align-items: center;\n  padding-bottom: 0px;\n\n  & > div {\n    width: 100%;\n    height: 47px;\n    max-width: 300px;\n    margin-right: 10px;\n    background-color: ", ";\n    border: none;\n    font-size: 14px;\n    border-radius: 8px;\n    > div:first-child {\n      height: 100%;\n    }\n  }\n\n  .order-status-multi-select {\n    p {\n      padding: 0;\n      color: ", " !important;\n    }\n  }\n\n  .date-filter-container {\n    z-index: 100;\n  }\n\n  input {\n    width: 100%;\n    height: 47px;\n    padding: 10px 25px;\n    box-sizing: border-box;\n    &::-webkit-outer-spin-button,\n    &::-webkit-inner-spin-button {\n      -webkit-appearance: none;\n      margin: 0;\n    }\n    -moz-appearance: textfield;\n  }\n\n  .close {\n    right: 8px;\n  }\n\n  .external_id {\n    @media (max-width: 1200px) {\n     flex: auto;\n    }\n  }\n\n  @media (max-width: 798px) {\n    flex-direction: column !important;\n    padding: 10px 15px 0 0px;\n    & > div {\n      margin-top: 15px;\n    }\n  }\n\n  ", "\n"])), function (props) {
   return props.theme.colors.secundary;
 }, function (props) {
   return props.theme.colors.headingColor;

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

@@ -18,7 +18,6 @@ var _OrdersDashboard = require("../OrdersDashboard");
 var _OrderStatusSubFilter = require("../OrderStatusSubFilter");
 var _OrderNotification = require("../OrderNotification");
 var _WizardOrders = require("../WizardOrders");
-var _OrdersHeaderFilterGroup = require("../OrdersHeaderFilterGroup");
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -37,6 +36,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     isSelectedOrders = props.isSelectedOrders,
     searchValue = props.searchValue,
     driverGroupList = props.driverGroupList,
+    assignableDriverGroupList = props.assignableDriverGroupList,
     driversList = props.driversList,
     paymethodsList = props.paymethodsList,
     businessesList = props.businessesList,
@@ -62,7 +62,8 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setAllowColumns = props.setAllowColumns,
     timeStatus = props.timeStatus,
     setTimeStatus = props.setTimeStatus,
-    isUseQuery = props.isUseQuery;
+    isUseQuery = props.isUseQuery,
+    disableDriverLocationsSockets = props.disableDriverLocationsSockets;
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
     t = _useLanguage2[1];
@@ -215,6 +216,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     isSelectedOrders: isSelectedOrders,
     title: t('ORDERS_LIST', 'Orders list'),
     searchValue: searchValue,
+    assignableDriverGroupList: assignableDriverGroupList,
     driverGroupList: driverGroupList,
     driversList: driversList,
     citiesList: citiesList,
@@ -233,7 +235,8 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
     setFilterModalOpen: setFilterModalOpen,
     setTimeStatus: setTimeStatus,
     setSlaSettingTime: setSlaSettingTime,
-    isLateralBar: isLateralBar
+    isLateralBar: isLateralBar,
+    disableDriverLocationsSockets: disableDriverLocationsSockets
   }), /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
     isUseQuery: isUseQuery,
     selectedOrderStatus: ordersStatusGroup,

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

@@ -12,6 +12,11 @@ var _styles = 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -38,6 +43,28 @@ var PaymethodTypeSelector = exports.PaymethodTypeSelector = function PaymethodTy
     value: 'default',
     content: /*#__PURE__*/_react.default.createElement(_styles.Option, null, t('PAYMETHODS_LOADING', 'Paymethods loading'), "...")
   }];
+  var _useState5 = (0, _react.useState)({
+      currentPage: 1,
+      pageSize: 5,
+      totalItems: null,
+      totalPages: null
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    pagination = _useState6[0],
+    setPagination = _useState6[1];
+  var handleChangePage = function handleChangePage(page) {
+    setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
+      currentPage: page
+    }));
+  };
+  var handleChangePageSize = function handleChangePageSize(pageSize) {
+    var expectedPage = Math.ceil((((pagination === null || pagination === void 0 ? void 0 : pagination.currentPage) - 1) * (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) + 1) / pageSize);
+    setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
+      currentPage: expectedPage,
+      pageSize: pageSize,
+      totalPages: Math.ceil((paymethodsTypes === null || paymethodsTypes === void 0 ? void 0 : paymethodsTypes.length) / pageSize)
+    }));
+  };
   (0, _react.useEffect)(function () {
     var _paymthodsOptionList = [];
     if (!paymethodsList.loading) {
@@ -65,6 +92,14 @@ var PaymethodTypeSelector = exports.PaymethodTypeSelector = function PaymethodTy
     }
     setPaymethodsTypes(_paymthodsOptionList);
   }, [paymethodsList, searchValue]);
+  (0, _react.useEffect)(function () {
+    if (paymethodsTypes !== null && paymethodsTypes !== void 0 && paymethodsTypes.length) {
+      setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
+        totalItems: paymethodsTypes === null || paymethodsTypes === void 0 ? void 0 : paymethodsTypes.length,
+        totalPages: Math.ceil((paymethodsTypes === null || paymethodsTypes === void 0 ? void 0 : paymethodsTypes.length) / 10)
+      }));
+    }
+  }, [paymethodsTypes]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !paymethodsList.loading ? /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
     defaultValue: filterValues.paymethodIds,
     placeholder: placeholder,
@@ -79,7 +114,11 @@ var PaymethodTypeSelector = exports.PaymethodTypeSelector = function PaymethodTy
     searchValue: searchValue,
     handleChangeSearch: function handleChangeSearch(val) {
       return setSearchValue(val);
-    }
+    },
+    isHidePagecontrol: true,
+    pagination: pagination,
+    handleChangePage: handleChangePage,
+    handleChangePageSize: handleChangePageSize
   }) : /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
     defaultValue: "default",
     options: paymthodsLoading,

package/_modules/components/Shared/CitySelector/index.js

@@ -48,6 +48,28 @@ var CitySelectorUI = function CitySelectorUI(props) {
   var placeholder = /*#__PURE__*/_react.default.createElement(_styles.PlaceholderTitle, {
     isDefault: isDefault
   }, t('SELECT_CITY', 'Select City'));
+  var _useState5 = (0, _react.useState)({
+      currentPage: 1,
+      pageSize: 5,
+      totalItems: null,
+      totalPages: null
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    pagination = _useState6[0],
+    setPagination = _useState6[1];
+  var handleChangePage = function handleChangePage(page) {
+    setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
+      currentPage: page
+    }));
+  };
+  var handleChangePageSize = function handleChangePageSize(pageSize) {
+    var expectedPage = Math.ceil((((pagination === null || pagination === void 0 ? void 0 : pagination.currentPage) - 1) * (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) + 1) / pageSize);
+    setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
+      currentPage: expectedPage,
+      pageSize: pageSize,
+      totalPages: Math.ceil((cityOptions === null || cityOptions === void 0 ? void 0 : cityOptions.length) / pageSize)
+    }));
+  };
   (0, _react.useEffect)(function () {
     if (citiesList !== null && citiesList !== void 0 && citiesList.loading) return;
     var _cityOptions = citiesList === null || citiesList === void 0 ? void 0 : citiesList.cities.filter(function (option) {
@@ -73,6 +95,14 @@ var CitySelectorUI = function CitySelectorUI(props) {
       handleChangeCity(citiesList === null || citiesList === void 0 || (_citiesList$cities$ = citiesList.cities[0]) === null || _citiesList$cities$ === void 0 ? void 0 : _citiesList$cities$.id);
     }
   }, [cityOptions, isAddMode]);
+  (0, _react.useEffect)(function () {
+    if (cityOptions !== null && cityOptions !== void 0 && cityOptions.length) {
+      setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
+        totalItems: cityOptions === null || cityOptions === void 0 ? void 0 : cityOptions.length,
+        totalPages: Math.ceil((cityOptions === null || cityOptions === void 0 ? void 0 : cityOptions.length) / 10)
+      }));
+    }
+  }, [cityOptions]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, citiesList !== null && citiesList !== void 0 && citiesList.loading ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
     style: {
       height: '100%',
@@ -100,7 +130,11 @@ var CitySelectorUI = function CitySelectorUI(props) {
     searchValue: searchValue,
     handleChangeSearch: function handleChangeSearch(val) {
       return setSearchValue(val);
-    }
+    },
+    isHidePagecontrol: true,
+    pagination: pagination,
+    handleChangePage: handleChangePage,
+    handleChangePageSize: handleChangePageSize
   })));
 };
 var CitySelector = exports.CitySelector = function CitySelector(props) {

package/_modules/contexts/FilterValuesContext/index.js

@@ -52,9 +52,9 @@ var FilterValuesProvider = exports.FilterValuesProvider = function FilterValuesP
       customerEmail: null,
       customerCellphone: null,
       customerLastname: null,
-      administratorIds: [],
       coupon: null,
-      offerId: null
+      offerId: null,
+      administratorIds: []
     }),
     _useState2 = _slicedToArray(_useState, 2),
     filterValues = _useState2[0],

package/_modules/styles/MultiSelect/index.js

@@ -47,7 +47,8 @@ var MultiSelect = exports.MultiSelect = function MultiSelect(props) {
     handleChangePageSize = props.handleChangePageSize,
     useLazyPagination = props.useLazyPagination,
     isLoading = props.isLoading,
-    optionsPosition = props.optionsPosition;
+    optionsPosition = props.optionsPosition,
+    isHidePagecontrol = props.isHidePagecontrol;
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -195,6 +196,7 @@ var MultiSelect = exports.MultiSelect = function MultiSelect(props) {
     totalPages: pagination === null || pagination === void 0 ? void 0 : pagination.totalPages,
     handleChangePage: handlerChangePage,
     handleChangePageSize: handleChangePageSize,
-    defaultPageSize: pagination === null || pagination === void 0 ? void 0 : pagination.pageSize
+    defaultPageSize: pagination === null || pagination === void 0 ? void 0 : pagination.pageSize,
+    isHidePagecontrol: isHidePagecontrol
   }))));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.64",
+  "version": "1.43.66",
   "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.40",
+    "ordering-components-admin-external": "1.43.42",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

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

@@ -233,7 +233,7 @@ export const MessagesListing = (props) => {
   const OrdersListControlProps = {
     ...props,
     UIComponent: MessagesListingUI,
-    driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', 'assigned_orders_count', 'last_order_assigned_at', 'last_location_at', 'cellphone', 'photo', 'qualification']
+    driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups.name', 'driver_groups.id', 'assigned_orders_count', 'last_order_assigned_at', 'last_location_at', 'cellphone', 'photo', 'qualification']
   }
   return <OrdersManageController {...OrdersListControlProps} />
 }

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

@@ -29,6 +29,29 @@ export const AdminsSelector = (props) => {
   const [searchValue, setSearchValue] = useState(null)
   const adminsLoading = [{ value: 'default', content: <Option small={small}>{t('LOADING', 'loading')}...</Option> }]
   const Placeholder = <PlaceholderTitle>{t('SELECT_ADMINISTRATOR', 'Select the administrator')}</PlaceholderTitle>
+  const [pagination, setPagination] = useState({
+    currentPage: 1,
+    pageSize: 5,
+    totalItems: null,
+    totalPages: null
+  })
+
+  const handleChangePage = (page) => {
+    setPagination({
+      ...pagination,
+      currentPage: page
+    })
+  }
+
+  const handleChangePageSize = (pageSize) => {
+    const expectedPage = Math.ceil(((pagination?.currentPage - 1) * pagination?.pageSize + 1) / pageSize)
+    setPagination({
+      ...pagination,
+      currentPage: expectedPage,
+      pageSize,
+      totalPages: Math.ceil(adminsMultiOptionList?.length / pageSize)
+    })
+  }
 
   useEffect(() => {
     if (!adminsList?.loading && adminsList?.admins?.length > 0) {
@@ -61,6 +84,16 @@ export const AdminsSelector = (props) => {
     }
   }, [adminsList, defaultValue, searchValue])
 
+  useEffect(() => {
+    if (adminsMultiOptionList?.length) {
+      setPagination({
+        ...pagination,
+        totalItems: adminsMultiOptionList?.length,
+        totalPages: Math.ceil(adminsMultiOptionList?.length / 10)
+      })
+    }
+  }, [adminsMultiOptionList])
+
   return (
     <>
       {!adminsList?.loading ? (
@@ -76,6 +109,10 @@ export const AdminsSelector = (props) => {
           searchBarIsNotLazyLoad
           searchValue={searchValue}
           handleChangeSearch={(val) => setSearchValue(val)}
+          isHidePagecontrol
+          pagination={pagination}
+          handleChangePage={handleChangePage}
+          handleChangePageSize={handleChangePageSize}
         />
       ) : (
         <MultiSelect

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

@@ -139,7 +139,7 @@ export const DriversManager = (props) => {
   const DriversControlProps = {
     ...props,
     asDashboard: true,
-    propsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', 'assigned_orders_count', 'last_order_assigned_at', 'last_location_at', 'cellphone', 'photo', 'qualification'],
+    propsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups.name', 'driver_groups.id', 'assigned_orders_count', 'photo'],
     UIComponent: DriversManagerUI
   }
   return (

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

@@ -57,7 +57,8 @@ const OrdersManagerUI = (props) => {
     allowColumns,
     setAllowColumns,
     isUseQuery,
-    adminsList
+    adminsList,
+    assignableDriverGroupList
   } = props
 
   const [, t] = useLanguage()
@@ -203,6 +204,7 @@ const OrdersManagerUI = (props) => {
           isDisableControl={isSelectedOrders}
           title={t('ORDER_MANAGER', 'Orders manager')}
           searchValue={searchValue}
+          assignableDriverGroupList={assignableDriverGroupList}
           driverGroupList={driverGroupList}
           driversList={driversList}
           citiesList={citiesList}
@@ -368,7 +370,7 @@ export const AllInOne = (props) => {
   const OrdersListControlProps = {
     ...props,
     UIComponent: OrdersManagerUI,
-    driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', 'assigned_orders_count', 'last_order_assigned_at', 'last_location_at', 'cellphone', 'photo', 'qualification']
+    driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups.name', 'driver_groups.id', 'assigned_orders_count', 'photo']
   }
   return <OrdersManageController {...OrdersListControlProps} />
 }

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

@@ -23,6 +23,29 @@ export const BusinessesSelector = (props) => {
   const [, t] = useLanguage()
   const [businessTypes, setBusinessTypes] = useState([])
   const [searchValue, setSearchValue] = useState('')
+  const [pagination, setPagination] = useState({
+    currentPage: 1,
+    pageSize: 5,
+    totalItems: null,
+    totalPages: null
+  })
+
+  const handleChangePage = (page) => {
+    setPagination({
+      ...pagination,
+      currentPage: page
+    })
+  }
+
+  const handleChangePageSize = (pageSize) => {
+    const expectedPage = Math.ceil(((pagination?.currentPage - 1) * pagination?.pageSize + 1) / pageSize)
+    setPagination({
+      ...pagination,
+      currentPage: expectedPage,
+      pageSize,
+      totalPages: Math.ceil(businessTypes?.length / pageSize)
+    })
+  }
 
   const Placeholder = <PlaceholderTitle>{t('SELECT_BUSINESS', 'Select business')}</PlaceholderTitle>
   const businessesLoading = [{ value: 'default', content: <Option>{t('BUSINESSES_LOADING', 'Businesses loading')}...</Option> }]
@@ -64,6 +87,16 @@ export const BusinessesSelector = (props) => {
     setBusinessTypes(_businessesOptionList)
   }, [businessesList, searchValue])
 
+  useEffect(() => {
+    if (businessTypes?.length) {
+      setPagination({
+        ...pagination,
+        totalItems: businessTypes?.length,
+        totalPages: Math.ceil(businessTypes?.length / 10)
+      })
+    }
+  }, [businessTypes])
+
   return (
     <>
       {!businessesList.loading ? (
@@ -80,6 +113,10 @@ export const BusinessesSelector = (props) => {
           searchBarIsNotLazyLoad
           searchValue={searchValue}
           handleChangeSearch={(val) => setSearchValue(val)}
+          isHidePagecontrol
+          pagination={pagination}
+          handleChangePage={handleChangePage}
+          handleChangePageSize={handleChangePageSize}
         />
       ) : (
         <MultiSelect

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

@@ -15,6 +15,29 @@ const CountryFilterUI = (props) => {
 
   const [searchValue, setSearchValue] = useState('')
   const [countryTypes, setCountryTypes] = useState([])
+  const [pagination, setPagination] = useState({
+    currentPage: 1,
+    pageSize: 5,
+    totalItems: null,
+    totalPages: null
+  })
+
+  const handleChangePage = (page) => {
+    setPagination({
+      ...pagination,
+      currentPage: page
+    })
+  }
+
+  const handleChangePageSize = (pageSize) => {
+    const expectedPage = Math.ceil(((pagination?.currentPage - 1) * pagination?.pageSize + 1) / pageSize)
+    setPagination({
+      ...pagination,
+      currentPage: expectedPage,
+      pageSize,
+      totalPages: Math.ceil(countryTypes?.length / pageSize)
+    })
+  }
 
   const placeholder = (
     <PlaceholderTitle>
@@ -43,6 +66,16 @@ const CountryFilterUI = (props) => {
     setCountryTypes(_countryList)
   }, [countriesState, searchValue])
 
+  useEffect(() => {
+    if (countryTypes?.length) {
+      setPagination({
+        ...pagination,
+        totalItems: countryTypes?.length,
+        totalPages: Math.ceil(countryTypes?.length / 10)
+      })
+    }
+  }, [countryTypes])
+
   return (
     <>
       {!countriesState.loading ? (
@@ -57,6 +90,10 @@ const CountryFilterUI = (props) => {
           searchBarIsNotLazyLoad
           searchValue={searchValue}
           handleChangeSearch={(val) => setSearchValue(val)}
+          isHidePagecontrol
+          pagination={pagination}
+          handleChangePage={handleChangePage}
+          handleChangePageSize={handleChangePageSize}
         />
       ) : (
         <SkeletonWrapper>