ordering-ui-admin-external 1.43.64 → 1.43.66
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_bundles/{ordering-ui-admin.59d6b5f2801dce338f86.js → ordering-ui-admin.d1d5d69bc1de8f732c90.js} +2 -2
- package/_modules/components/Messages/MessagesListing/index.js +1 -1
- package/_modules/components/Orders/AdminsSelector/index.js +40 -1
- package/_modules/components/Orders/AllInOne/DriversManager/index.js +1 -1
- package/_modules/components/Orders/AllInOne/index.js +4 -2
- package/_modules/components/Orders/BusinessesSelector/index.js +40 -1
- package/_modules/components/Orders/CountryFilter/index.js +36 -2
- package/_modules/components/Orders/CurrencyFilter/index.js +44 -5
- package/_modules/components/Orders/DeliveriesManager/index.js +5 -3
- package/_modules/components/Orders/DriverMapMarkerAndInfo/index.js +5 -2
- package/_modules/components/Orders/DriverMultiSelector/index.js +1 -0
- package/_modules/components/Orders/DriversGroupTypeSelector/index.js +44 -5
- package/_modules/components/Orders/DriversList/index.js +57 -3
- package/_modules/components/Orders/DriversList/styles.js +6 -5
- package/_modules/components/Orders/InterActOrderMarker/index.js +5 -2
- package/_modules/components/Orders/OrdersContentHeader/index.js +2 -0
- package/_modules/components/Orders/OrdersDashboardList/index.js +2 -1
- package/_modules/components/Orders/OrdersFilterGroup/index.js +2 -2
- package/_modules/components/Orders/OrdersHeaderFilterGroup/index.js +9 -22
- package/_modules/components/Orders/OrdersHeaderFilterGroup/styles.js +1 -1
- package/_modules/components/Orders/OrdersManager/index.js +6 -3
- package/_modules/components/Orders/PaymethodTypeSelector/index.js +40 -1
- package/_modules/components/Shared/CitySelector/index.js +35 -1
- package/_modules/contexts/FilterValuesContext/index.js +2 -2
- package/_modules/styles/MultiSelect/index.js +4 -2
- package/package.json +2 -2
- package/src/components/Messages/MessagesListing/index.js +1 -1
- package/src/components/Orders/AdminsSelector/index.js +37 -0
- package/src/components/Orders/AllInOne/DriversManager/index.js +1 -1
- package/src/components/Orders/AllInOne/index.js +4 -2
- package/src/components/Orders/BusinessesSelector/index.js +37 -0
- package/src/components/Orders/CountryFilter/index.js +37 -0
- package/src/components/Orders/CurrencyFilter/index.js +37 -0
- package/src/components/Orders/DeliveriesManager/index.js +4 -2
- package/src/components/Orders/DriverMapMarkerAndInfo/index.js +8 -2
- package/src/components/Orders/DriverMultiSelector/index.js +1 -0
- package/src/components/Orders/DriversGroupTypeSelector/index.js +37 -0
- package/src/components/Orders/DriversList/index.js +56 -3
- package/src/components/Orders/DriversList/styles.js +12 -1
- package/src/components/Orders/InterActOrderMarker/index.js +10 -2
- package/src/components/Orders/OrdersContentHeader/index.js +2 -0
- package/src/components/Orders/OrdersDashboardList/index.js +2 -1
- package/src/components/Orders/OrdersFilterGroup/index.js +2 -8
- package/src/components/Orders/OrdersHeaderFilterGroup/index.js +9 -20
- package/src/components/Orders/OrdersHeaderFilterGroup/styles.js +1 -1
- package/src/components/Orders/OrdersManager/index.js +6 -3
- package/src/components/Orders/PaymethodTypeSelector/index.js +37 -0
- package/src/components/Shared/CitySelector/index.js +37 -0
- package/src/contexts/FilterValuesContext/index.js +2 -2
- package/src/styles/MultiSelect/index.js +3 -1
- package/template/pages/AllInOne/index.js +4 -0
- package/template/pages/DeliveriesManager/index.js +4 -0
- package/template/pages/DriversList/index.js +1 -1
- package/template/pages/OrdersList/index.js +6 -0
- /package/_bundles/{ordering-ui-admin.59d6b5f2801dce338f86.js.LICENSE.txt → ordering-ui-admin.d1d5d69bc1de8f732c90.js.LICENSE.txt} +0 -0
|
@@ -206,7 +206,7 @@ var MessagesListingUI = function MessagesListingUI(props) {
|
|
|
206
206
|
var MessagesListing = exports.MessagesListing = function MessagesListing(props) {
|
|
207
207
|
var OrdersListControlProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
208
208
|
UIComponent: MessagesListingUI,
|
|
209
|
-
driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', 'assigned_orders_count', 'last_order_assigned_at', 'last_location_at', 'cellphone', 'photo', 'qualification']
|
|
209
|
+
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']
|
|
210
210
|
});
|
|
211
211
|
return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.OrdersManage, OrdersListControlProps);
|
|
212
212
|
};
|
|
@@ -12,6 +12,11 @@ var _MultiSelect = require("../../../styles/MultiSelect");
|
|
|
12
12
|
var _styles = require("./styles");
|
|
13
13
|
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); }
|
|
14
14
|
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; }
|
|
15
|
+
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; }
|
|
16
|
+
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; }
|
|
17
|
+
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; }
|
|
18
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
19
|
+
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); }
|
|
15
20
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
16
21
|
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."); }
|
|
17
22
|
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); }
|
|
@@ -44,6 +49,28 @@ var AdminsSelector = exports.AdminsSelector = function AdminsSelector(props) {
|
|
|
44
49
|
}, t('LOADING', 'loading'), "...")
|
|
45
50
|
}];
|
|
46
51
|
var Placeholder = /*#__PURE__*/_react.default.createElement(_styles.PlaceholderTitle, null, t('SELECT_ADMINISTRATOR', 'Select the administrator'));
|
|
52
|
+
var _useState5 = (0, _react.useState)({
|
|
53
|
+
currentPage: 1,
|
|
54
|
+
pageSize: 5,
|
|
55
|
+
totalItems: null,
|
|
56
|
+
totalPages: null
|
|
57
|
+
}),
|
|
58
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
59
|
+
pagination = _useState6[0],
|
|
60
|
+
setPagination = _useState6[1];
|
|
61
|
+
var handleChangePage = function handleChangePage(page) {
|
|
62
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
63
|
+
currentPage: page
|
|
64
|
+
}));
|
|
65
|
+
};
|
|
66
|
+
var handleChangePageSize = function handleChangePageSize(pageSize) {
|
|
67
|
+
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);
|
|
68
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
69
|
+
currentPage: expectedPage,
|
|
70
|
+
pageSize: pageSize,
|
|
71
|
+
totalPages: Math.ceil((adminsMultiOptionList === null || adminsMultiOptionList === void 0 ? void 0 : adminsMultiOptionList.length) / pageSize)
|
|
72
|
+
}));
|
|
73
|
+
};
|
|
47
74
|
(0, _react.useEffect)(function () {
|
|
48
75
|
var _adminsList$admins;
|
|
49
76
|
if (!(adminsList !== null && adminsList !== void 0 && adminsList.loading) && (adminsList === null || adminsList === void 0 || (_adminsList$admins = adminsList.admins) === null || _adminsList$admins === void 0 ? void 0 : _adminsList$admins.length) > 0) {
|
|
@@ -81,6 +108,14 @@ var AdminsSelector = exports.AdminsSelector = function AdminsSelector(props) {
|
|
|
81
108
|
setAdminsMultiOptionList(_adminsOptionListTemp);
|
|
82
109
|
}
|
|
83
110
|
}, [adminsList, defaultValue, searchValue]);
|
|
111
|
+
(0, _react.useEffect)(function () {
|
|
112
|
+
if (adminsMultiOptionList !== null && adminsMultiOptionList !== void 0 && adminsMultiOptionList.length) {
|
|
113
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
114
|
+
totalItems: adminsMultiOptionList === null || adminsMultiOptionList === void 0 ? void 0 : adminsMultiOptionList.length,
|
|
115
|
+
totalPages: Math.ceil((adminsMultiOptionList === null || adminsMultiOptionList === void 0 ? void 0 : adminsMultiOptionList.length) / 10)
|
|
116
|
+
}));
|
|
117
|
+
}
|
|
118
|
+
}, [adminsMultiOptionList]);
|
|
84
119
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(adminsList !== null && adminsList !== void 0 && adminsList.loading) ? /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
|
|
85
120
|
defaultValue: filterValues.administratorIds,
|
|
86
121
|
placeholder: Placeholder,
|
|
@@ -96,7 +131,11 @@ var AdminsSelector = exports.AdminsSelector = function AdminsSelector(props) {
|
|
|
96
131
|
searchValue: searchValue,
|
|
97
132
|
handleChangeSearch: function handleChangeSearch(val) {
|
|
98
133
|
return setSearchValue(val);
|
|
99
|
-
}
|
|
134
|
+
},
|
|
135
|
+
isHidePagecontrol: true,
|
|
136
|
+
pagination: pagination,
|
|
137
|
+
handleChangePage: handleChangePage,
|
|
138
|
+
handleChangePageSize: handleChangePageSize
|
|
100
139
|
}) : /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
|
|
101
140
|
defaultValue: "default",
|
|
102
141
|
options: adminsLoading,
|
|
@@ -131,7 +131,7 @@ var DriversManagerUI = function DriversManagerUI(props) {
|
|
|
131
131
|
var DriversManager = exports.DriversManager = function DriversManager(props) {
|
|
132
132
|
var DriversControlProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
133
133
|
asDashboard: true,
|
|
134
|
-
propsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', '
|
|
134
|
+
propsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups.name', 'driver_groups.id', 'assigned_orders_count', 'photo'],
|
|
135
135
|
UIComponent: DriversManagerUI
|
|
136
136
|
});
|
|
137
137
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.DriversList, DriversControlProps));
|
|
@@ -62,7 +62,8 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
|
|
|
62
62
|
allowColumns = props.allowColumns,
|
|
63
63
|
setAllowColumns = props.setAllowColumns,
|
|
64
64
|
isUseQuery = props.isUseQuery,
|
|
65
|
-
adminsList = props.adminsList
|
|
65
|
+
adminsList = props.adminsList,
|
|
66
|
+
assignableDriverGroupList = props.assignableDriverGroupList;
|
|
66
67
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
67
68
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
68
69
|
t = _useLanguage2[1];
|
|
@@ -244,6 +245,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
|
|
|
244
245
|
isDisableControl: isSelectedOrders,
|
|
245
246
|
title: t('ORDER_MANAGER', 'Orders manager'),
|
|
246
247
|
searchValue: searchValue,
|
|
248
|
+
assignableDriverGroupList: assignableDriverGroupList,
|
|
247
249
|
driverGroupList: driverGroupList,
|
|
248
250
|
driversList: driversList,
|
|
249
251
|
citiesList: citiesList,
|
|
@@ -379,7 +381,7 @@ var OrdersManagerUI = function OrdersManagerUI(props) {
|
|
|
379
381
|
var AllInOne = exports.AllInOne = function AllInOne(props) {
|
|
380
382
|
var OrdersListControlProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
381
383
|
UIComponent: OrdersManagerUI,
|
|
382
|
-
driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', '
|
|
384
|
+
driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups.name', 'driver_groups.id', 'assigned_orders_count', 'photo']
|
|
383
385
|
});
|
|
384
386
|
return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.OrdersManage, OrdersListControlProps);
|
|
385
387
|
};
|
|
@@ -12,6 +12,11 @@ var _styles2 = require("./styles");
|
|
|
12
12
|
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); }
|
|
13
13
|
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; }
|
|
14
14
|
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; } } }; }
|
|
15
|
+
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; }
|
|
16
|
+
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; }
|
|
17
|
+
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; }
|
|
18
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
19
|
+
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); }
|
|
15
20
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
16
21
|
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."); }
|
|
17
22
|
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); }
|
|
@@ -33,6 +38,28 @@ var BusinessesSelector = exports.BusinessesSelector = function BusinessesSelecto
|
|
|
33
38
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
34
39
|
searchValue = _useState4[0],
|
|
35
40
|
setSearchValue = _useState4[1];
|
|
41
|
+
var _useState5 = (0, _react.useState)({
|
|
42
|
+
currentPage: 1,
|
|
43
|
+
pageSize: 5,
|
|
44
|
+
totalItems: null,
|
|
45
|
+
totalPages: null
|
|
46
|
+
}),
|
|
47
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
48
|
+
pagination = _useState6[0],
|
|
49
|
+
setPagination = _useState6[1];
|
|
50
|
+
var handleChangePage = function handleChangePage(page) {
|
|
51
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
52
|
+
currentPage: page
|
|
53
|
+
}));
|
|
54
|
+
};
|
|
55
|
+
var handleChangePageSize = function handleChangePageSize(pageSize) {
|
|
56
|
+
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);
|
|
57
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
58
|
+
currentPage: expectedPage,
|
|
59
|
+
pageSize: pageSize,
|
|
60
|
+
totalPages: Math.ceil((businessTypes === null || businessTypes === void 0 ? void 0 : businessTypes.length) / pageSize)
|
|
61
|
+
}));
|
|
62
|
+
};
|
|
36
63
|
var Placeholder = /*#__PURE__*/_react.default.createElement(_styles2.PlaceholderTitle, null, t('SELECT_BUSINESS', 'Select business'));
|
|
37
64
|
var businessesLoading = [{
|
|
38
65
|
value: 'default',
|
|
@@ -66,6 +93,14 @@ var BusinessesSelector = exports.BusinessesSelector = function BusinessesSelecto
|
|
|
66
93
|
}
|
|
67
94
|
setBusinessTypes(_businessesOptionList);
|
|
68
95
|
}, [businessesList, searchValue]);
|
|
96
|
+
(0, _react.useEffect)(function () {
|
|
97
|
+
if (businessTypes !== null && businessTypes !== void 0 && businessTypes.length) {
|
|
98
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
99
|
+
totalItems: businessTypes === null || businessTypes === void 0 ? void 0 : businessTypes.length,
|
|
100
|
+
totalPages: Math.ceil((businessTypes === null || businessTypes === void 0 ? void 0 : businessTypes.length) / 10)
|
|
101
|
+
}));
|
|
102
|
+
}
|
|
103
|
+
}, [businessTypes]);
|
|
69
104
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !businessesList.loading ? /*#__PURE__*/_react.default.createElement(_styles.MultiSelect, {
|
|
70
105
|
defaultValue: filterValues.businessIds,
|
|
71
106
|
placeholder: Placeholder,
|
|
@@ -82,7 +117,11 @@ var BusinessesSelector = exports.BusinessesSelector = function BusinessesSelecto
|
|
|
82
117
|
searchValue: searchValue,
|
|
83
118
|
handleChangeSearch: function handleChangeSearch(val) {
|
|
84
119
|
return setSearchValue(val);
|
|
85
|
-
}
|
|
120
|
+
},
|
|
121
|
+
isHidePagecontrol: true,
|
|
122
|
+
pagination: pagination,
|
|
123
|
+
handleChangePage: handleChangePage,
|
|
124
|
+
handleChangePageSize: handleChangePageSize
|
|
86
125
|
}) : /*#__PURE__*/_react.default.createElement(_styles.MultiSelect, {
|
|
87
126
|
defaultValue: "default",
|
|
88
127
|
options: businessesLoading,
|
|
@@ -13,12 +13,12 @@ var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skelet
|
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
14
|
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); }
|
|
15
15
|
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; }
|
|
16
|
+
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; } } }; }
|
|
16
17
|
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; }
|
|
17
18
|
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; }
|
|
18
19
|
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; }
|
|
19
20
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
20
21
|
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); }
|
|
21
|
-
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; } } }; }
|
|
22
22
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
23
23
|
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."); }
|
|
24
24
|
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); }
|
|
@@ -40,6 +40,28 @@ var CountryFilterUI = function CountryFilterUI(props) {
|
|
|
40
40
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
41
41
|
countryTypes = _useState4[0],
|
|
42
42
|
setCountryTypes = _useState4[1];
|
|
43
|
+
var _useState5 = (0, _react.useState)({
|
|
44
|
+
currentPage: 1,
|
|
45
|
+
pageSize: 5,
|
|
46
|
+
totalItems: null,
|
|
47
|
+
totalPages: null
|
|
48
|
+
}),
|
|
49
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
50
|
+
pagination = _useState6[0],
|
|
51
|
+
setPagination = _useState6[1];
|
|
52
|
+
var handleChangePage = function handleChangePage(page) {
|
|
53
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
54
|
+
currentPage: page
|
|
55
|
+
}));
|
|
56
|
+
};
|
|
57
|
+
var handleChangePageSize = function handleChangePageSize(pageSize) {
|
|
58
|
+
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);
|
|
59
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
60
|
+
currentPage: expectedPage,
|
|
61
|
+
pageSize: pageSize,
|
|
62
|
+
totalPages: Math.ceil((countryTypes === null || countryTypes === void 0 ? void 0 : countryTypes.length) / pageSize)
|
|
63
|
+
}));
|
|
64
|
+
};
|
|
43
65
|
var placeholder = /*#__PURE__*/_react.default.createElement(_styles.PlaceholderTitle, null, t('SELECT_A_COUNTRY', 'Select a country'));
|
|
44
66
|
(0, _react.useEffect)(function () {
|
|
45
67
|
var _countryList = [];
|
|
@@ -67,6 +89,14 @@ var CountryFilterUI = function CountryFilterUI(props) {
|
|
|
67
89
|
}
|
|
68
90
|
setCountryTypes(_countryList);
|
|
69
91
|
}, [countriesState, searchValue]);
|
|
92
|
+
(0, _react.useEffect)(function () {
|
|
93
|
+
if (countryTypes !== null && countryTypes !== void 0 && countryTypes.length) {
|
|
94
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
95
|
+
totalItems: countryTypes === null || countryTypes === void 0 ? void 0 : countryTypes.length,
|
|
96
|
+
totalPages: Math.ceil((countryTypes === null || countryTypes === void 0 ? void 0 : countryTypes.length) / 10)
|
|
97
|
+
}));
|
|
98
|
+
}
|
|
99
|
+
}, [countryTypes]);
|
|
70
100
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !countriesState.loading ? /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
|
|
71
101
|
placeholder: placeholder,
|
|
72
102
|
defaultValue: filterValues.countryCode,
|
|
@@ -81,7 +111,11 @@ var CountryFilterUI = function CountryFilterUI(props) {
|
|
|
81
111
|
searchValue: searchValue,
|
|
82
112
|
handleChangeSearch: function handleChangeSearch(val) {
|
|
83
113
|
return setSearchValue(val);
|
|
84
|
-
}
|
|
114
|
+
},
|
|
115
|
+
isHidePagecontrol: true,
|
|
116
|
+
pagination: pagination,
|
|
117
|
+
handleChangePage: handleChangePage,
|
|
118
|
+
handleChangePageSize: handleChangePageSize
|
|
85
119
|
}) : /*#__PURE__*/_react.default.createElement(_styles.SkeletonWrapper, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
86
120
|
style: {
|
|
87
121
|
height: '57px'
|
|
@@ -13,6 +13,11 @@ var _constants = require("../../../config/constants");
|
|
|
13
13
|
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); }
|
|
14
14
|
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; }
|
|
15
15
|
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; } } }; }
|
|
16
|
+
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; }
|
|
17
|
+
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; }
|
|
18
|
+
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; }
|
|
19
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
20
|
+
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); }
|
|
16
21
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
17
22
|
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."); }
|
|
18
23
|
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); }
|
|
@@ -29,11 +34,33 @@ var CurrencyFilter = exports.CurrencyFilter = function CurrencyFilter(props) {
|
|
|
29
34
|
_useState2 = _slicedToArray(_useState, 2),
|
|
30
35
|
searchValue = _useState2[0],
|
|
31
36
|
setSearchValue = _useState2[1];
|
|
32
|
-
var
|
|
33
|
-
|
|
37
|
+
var _useState3 = (0, _react.useState)({
|
|
38
|
+
currentPage: 1,
|
|
39
|
+
pageSize: 5,
|
|
40
|
+
totalItems: null,
|
|
41
|
+
totalPages: null
|
|
42
|
+
}),
|
|
34
43
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
35
|
-
|
|
36
|
-
|
|
44
|
+
pagination = _useState4[0],
|
|
45
|
+
setPagination = _useState4[1];
|
|
46
|
+
var handleChangePage = function handleChangePage(page) {
|
|
47
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
48
|
+
currentPage: page
|
|
49
|
+
}));
|
|
50
|
+
};
|
|
51
|
+
var handleChangePageSize = function handleChangePageSize(pageSize) {
|
|
52
|
+
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);
|
|
53
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
54
|
+
currentPage: expectedPage,
|
|
55
|
+
pageSize: pageSize,
|
|
56
|
+
totalPages: Math.ceil((_constants.currencyList === null || _constants.currencyList === void 0 ? void 0 : _constants.currencyList.length) / pageSize)
|
|
57
|
+
}));
|
|
58
|
+
};
|
|
59
|
+
var placeholder = /*#__PURE__*/_react.default.createElement(_styles.PlaceholderTitle, null, t('SELECT_A_CURRENCY', 'Select a currency'));
|
|
60
|
+
var _useState5 = (0, _react.useState)([]),
|
|
61
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
62
|
+
countryTypes = _useState6[0],
|
|
63
|
+
setCountryTypes = _useState6[1];
|
|
37
64
|
(0, _react.useEffect)(function () {
|
|
38
65
|
var _countryList = [];
|
|
39
66
|
var _groupsOption = _constants.currencyList.filter(function (option) {
|
|
@@ -58,6 +85,14 @@ var CurrencyFilter = exports.CurrencyFilter = function CurrencyFilter(props) {
|
|
|
58
85
|
}
|
|
59
86
|
setCountryTypes(_countryList);
|
|
60
87
|
}, [_constants.currencyList, searchValue]);
|
|
88
|
+
(0, _react.useEffect)(function () {
|
|
89
|
+
if (_constants.currencyList !== null && _constants.currencyList !== void 0 && _constants.currencyList.length) {
|
|
90
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
91
|
+
totalItems: _constants.currencyList === null || _constants.currencyList === void 0 ? void 0 : _constants.currencyList.length,
|
|
92
|
+
totalPages: Math.ceil((_constants.currencyList === null || _constants.currencyList === void 0 ? void 0 : _constants.currencyList.length) / 10)
|
|
93
|
+
}));
|
|
94
|
+
}
|
|
95
|
+
}, [_constants.currencyList]);
|
|
61
96
|
return /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
|
|
62
97
|
placeholder: placeholder,
|
|
63
98
|
defaultValue: filterValues.currency,
|
|
@@ -72,6 +107,10 @@ var CurrencyFilter = exports.CurrencyFilter = function CurrencyFilter(props) {
|
|
|
72
107
|
searchValue: searchValue,
|
|
73
108
|
handleChangeSearch: function handleChangeSearch(val) {
|
|
74
109
|
return setSearchValue(val);
|
|
75
|
-
}
|
|
110
|
+
},
|
|
111
|
+
isHidePagecontrol: true,
|
|
112
|
+
pagination: pagination,
|
|
113
|
+
handleChangePage: handleChangePage,
|
|
114
|
+
handleChangePageSize: handleChangePageSize
|
|
76
115
|
});
|
|
77
116
|
};
|
|
@@ -47,7 +47,8 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
|
|
|
47
47
|
timeStatus = props.timeStatus,
|
|
48
48
|
setTimeStatus = props.setTimeStatus,
|
|
49
49
|
isUseQuery = props.isUseQuery,
|
|
50
|
-
adminsList = props.adminsList
|
|
50
|
+
adminsList = props.adminsList,
|
|
51
|
+
assignableDriverGroupList = props.assignableDriverGroupList;
|
|
51
52
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
52
53
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
53
54
|
t = _useLanguage2[1];
|
|
@@ -121,7 +122,8 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
|
|
|
121
122
|
setFilterModalOpen: setFilterModalOpen,
|
|
122
123
|
setTimeStatus: setTimeStatus,
|
|
123
124
|
setSlaSettingTime: setSlaSettingTime,
|
|
124
|
-
adminsList: adminsList
|
|
125
|
+
adminsList: adminsList,
|
|
126
|
+
assignableDriverGroupList: assignableDriverGroupList
|
|
125
127
|
}), /*#__PURE__*/_react.default.createElement(_styles.OrdersContent, null, /*#__PURE__*/_react.default.createElement(_styles.WrapItemView, null, /*#__PURE__*/_react.default.createElement(_DeliveryDashboard.DeliveryDashboard, {
|
|
126
128
|
searchValue: searchValue,
|
|
127
129
|
filterValues: filterValues,
|
|
@@ -161,7 +163,7 @@ var DeliveriesManager = exports.DeliveriesManager = function DeliveriesManager(p
|
|
|
161
163
|
var OrdersListControlProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
162
164
|
isOnlyDelivery: true,
|
|
163
165
|
UIComponent: DeliveriesManagerUI,
|
|
164
|
-
driversPropsToFetch: ['id', 'name', 'lastname', 'location', 'enabled', 'available', 'busy', 'driver_groups', 'assigned_orders_count', 'last_order_assigned_at', 'last_location_at', 'cellphone', 'photo', 'qualification']
|
|
166
|
+
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']
|
|
165
167
|
});
|
|
166
168
|
return /*#__PURE__*/_react.default.createElement(_orderingComponentsAdminExternal.OrdersManage, OrdersListControlProps);
|
|
167
169
|
};
|
|
@@ -17,7 +17,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
17
17
|
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; }
|
|
18
18
|
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; } }
|
|
19
19
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
20
|
-
var
|
|
20
|
+
var DriverMapMarkerPropsAreEqual = function DriverMapMarkerPropsAreEqual(prevProps, nextProps) {
|
|
21
|
+
return JSON.stringify(prevProps.driver) === JSON.stringify(nextProps.driver) && prevProps.timeStatus === nextProps.timeStatus;
|
|
22
|
+
};
|
|
23
|
+
var DriverMapMarkerAndInfo = exports.DriverMapMarkerAndInfo = /*#__PURE__*/_react.default.memo(function (props) {
|
|
21
24
|
var _driver$drivergroups, _theme$images;
|
|
22
25
|
var driver = props.driver,
|
|
23
26
|
timeStatus = props.timeStatus;
|
|
@@ -72,4 +75,4 @@ var DriverMapMarkerAndInfo = exports.DriverMapMarkerAndInfo = function DriverMap
|
|
|
72
75
|
}) : /*#__PURE__*/_react.default.createElement(_styles.MapMarkerImg, {
|
|
73
76
|
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
|
|
74
77
|
})));
|
|
75
|
-
};
|
|
78
|
+
}, DriverMapMarkerPropsAreEqual);
|
|
@@ -166,6 +166,7 @@ var DriverMultiSelectorUI = function DriverMultiSelectorUI(props) {
|
|
|
166
166
|
var DriverMultiSelector = exports.DriverMultiSelector = function DriverMultiSelector(props) {
|
|
167
167
|
var DriversControlProps = _objectSpread(_objectSpread({}, props), {}, {
|
|
168
168
|
UIComponent: DriverMultiSelectorUI,
|
|
169
|
+
disableDriverLocationsSockets: true,
|
|
169
170
|
paginationSettings: {
|
|
170
171
|
initialPage: 1,
|
|
171
172
|
pageSize: 10,
|
|
@@ -12,6 +12,11 @@ var _styles = require("./styles");
|
|
|
12
12
|
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); }
|
|
13
13
|
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; }
|
|
14
14
|
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; } } }; }
|
|
15
|
+
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; }
|
|
16
|
+
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; }
|
|
17
|
+
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; }
|
|
18
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
19
|
+
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); }
|
|
15
20
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
16
21
|
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."); }
|
|
17
22
|
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); }
|
|
@@ -31,15 +36,37 @@ var DriversGroupTypeSelector = exports.DriversGroupTypeSelector = function Drive
|
|
|
31
36
|
_useState2 = _slicedToArray(_useState, 2),
|
|
32
37
|
searchValue = _useState2[0],
|
|
33
38
|
setSearchValue = _useState2[1];
|
|
34
|
-
var
|
|
35
|
-
|
|
39
|
+
var _useState3 = (0, _react.useState)({
|
|
40
|
+
currentPage: 1,
|
|
41
|
+
pageSize: 5,
|
|
42
|
+
totalItems: null,
|
|
43
|
+
totalPages: null
|
|
44
|
+
}),
|
|
36
45
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
37
|
-
|
|
38
|
-
|
|
46
|
+
pagination = _useState4[0],
|
|
47
|
+
setPagination = _useState4[1];
|
|
48
|
+
var placeholder = /*#__PURE__*/_react.default.createElement(_styles.PlaceholderTitle, null, title);
|
|
49
|
+
var _useState5 = (0, _react.useState)([]),
|
|
50
|
+
_useState6 = _slicedToArray(_useState5, 2),
|
|
51
|
+
groupTypes = _useState6[0],
|
|
52
|
+
setGroupTypes = _useState6[1];
|
|
39
53
|
var groupTypesLoading = [{
|
|
40
54
|
value: 'default',
|
|
41
55
|
content: /*#__PURE__*/_react.default.createElement(_styles.Option, null, (_dictionary$GROUP_LOA = dictionary === null || dictionary === void 0 ? void 0 : dictionary.GROUP_LOADING) !== null && _dictionary$GROUP_LOA !== void 0 ? _dictionary$GROUP_LOA : 'Group loading', "...")
|
|
42
56
|
}];
|
|
57
|
+
var handleChangePage = function handleChangePage(page) {
|
|
58
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
59
|
+
currentPage: page
|
|
60
|
+
}));
|
|
61
|
+
};
|
|
62
|
+
var handleChangePageSize = function handleChangePageSize(pageSize) {
|
|
63
|
+
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);
|
|
64
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
65
|
+
currentPage: expectedPage,
|
|
66
|
+
pageSize: pageSize,
|
|
67
|
+
totalPages: Math.ceil((groupTypes === null || groupTypes === void 0 ? void 0 : groupTypes.length) / pageSize)
|
|
68
|
+
}));
|
|
69
|
+
};
|
|
43
70
|
(0, _react.useEffect)(function () {
|
|
44
71
|
var _groupList = [];
|
|
45
72
|
if (!driverGroupList.loading) {
|
|
@@ -66,6 +93,14 @@ var DriversGroupTypeSelector = exports.DriversGroupTypeSelector = function Drive
|
|
|
66
93
|
}
|
|
67
94
|
setGroupTypes(_groupList);
|
|
68
95
|
}, [driverGroupList, searchValue]);
|
|
96
|
+
(0, _react.useEffect)(function () {
|
|
97
|
+
if (groupTypes !== null && groupTypes !== void 0 && groupTypes.length) {
|
|
98
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
99
|
+
totalItems: groupTypes === null || groupTypes === void 0 ? void 0 : groupTypes.length,
|
|
100
|
+
totalPages: Math.ceil((groupTypes === null || groupTypes === void 0 ? void 0 : groupTypes.length) / 10)
|
|
101
|
+
}));
|
|
102
|
+
}
|
|
103
|
+
}, [groupTypes]);
|
|
69
104
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !driverGroupList.loading ? /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
|
|
70
105
|
placeholder: placeholder,
|
|
71
106
|
defaultValue: filterValues,
|
|
@@ -79,7 +114,11 @@ var DriversGroupTypeSelector = exports.DriversGroupTypeSelector = function Drive
|
|
|
79
114
|
searchValue: searchValue,
|
|
80
115
|
handleChangeSearch: function handleChangeSearch(val) {
|
|
81
116
|
return setSearchValue(val);
|
|
82
|
-
}
|
|
117
|
+
},
|
|
118
|
+
isHidePagecontrol: true,
|
|
119
|
+
pagination: pagination,
|
|
120
|
+
handleChangePage: handleChangePage,
|
|
121
|
+
handleChangePageSize: handleChangePageSize
|
|
83
122
|
}) : /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
|
|
84
123
|
defaultValue: "default",
|
|
85
124
|
options: groupTypesLoading,
|
|
@@ -1,22 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
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); }
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.DriversList = void 0;
|
|
7
|
-
var _react =
|
|
8
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
8
9
|
var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
|
|
9
10
|
var _utils = require("../../../utils");
|
|
10
11
|
var _useWindowSize2 = require("../../../hooks/useWindowSize");
|
|
11
12
|
var _styles = require("./styles");
|
|
12
13
|
var _Driver = require("./Driver");
|
|
14
|
+
var _Shared = require("../../Shared");
|
|
13
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
16
|
+
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); }
|
|
17
|
+
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; }
|
|
14
18
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
15
19
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
16
|
-
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); }
|
|
17
20
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
18
21
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
22
|
+
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; }
|
|
23
|
+
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; }
|
|
24
|
+
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; }
|
|
25
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
26
|
+
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); }
|
|
27
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
28
|
+
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."); }
|
|
29
|
+
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); }
|
|
19
30
|
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; }
|
|
31
|
+
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; } }
|
|
32
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
20
33
|
var DriversList = exports.DriversList = function DriversList(props) {
|
|
21
34
|
var loading = props.loading,
|
|
22
35
|
driversIsOnline = props.driversIsOnline,
|
|
@@ -29,6 +42,16 @@ var DriversList = exports.DriversList = function DriversList(props) {
|
|
|
29
42
|
showCompressedInfo = props.showCompressedInfo;
|
|
30
43
|
var _useWindowSize = (0, _useWindowSize2.useWindowSize)(),
|
|
31
44
|
width = _useWindowSize.width;
|
|
45
|
+
var _useState = (0, _react.useState)({
|
|
46
|
+
currentPage: 1,
|
|
47
|
+
pageSize: 10,
|
|
48
|
+
totalItems: null,
|
|
49
|
+
totalPages: null
|
|
50
|
+
}),
|
|
51
|
+
_useState2 = _slicedToArray(_useState, 2),
|
|
52
|
+
pagination = _useState2[0],
|
|
53
|
+
setPagination = _useState2[1];
|
|
54
|
+
var drivers = driversIsOnline ? onlineDrivers : offlineDrivers;
|
|
32
55
|
var handleClickDriver = function handleClickDriver(e, driver) {
|
|
33
56
|
var isInvalid = e.target.closest('.driver-orders');
|
|
34
57
|
if (isInvalid) return;
|
|
@@ -46,6 +69,31 @@ var DriversList = exports.DriversList = function DriversList(props) {
|
|
|
46
69
|
}
|
|
47
70
|
handleOpenDriverOrders(driver);
|
|
48
71
|
};
|
|
72
|
+
var filterFunction = function filterFunction(_, index) {
|
|
73
|
+
var validation = (pagination === null || pagination === void 0 ? void 0 : pagination.currentPage) === 1 ? index < pagination.pageSize * pagination.currentPage : index >= pagination.pageSize * (pagination.currentPage - 1) && index < pagination.pageSize * pagination.currentPage;
|
|
74
|
+
return validation;
|
|
75
|
+
};
|
|
76
|
+
var handleChangePage = function handleChangePage(page) {
|
|
77
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
78
|
+
currentPage: page
|
|
79
|
+
}));
|
|
80
|
+
};
|
|
81
|
+
var handleChangePageSize = function handleChangePageSize(pageSize) {
|
|
82
|
+
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);
|
|
83
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
84
|
+
currentPage: expectedPage,
|
|
85
|
+
pageSize: pageSize,
|
|
86
|
+
totalPages: Math.ceil((drivers === null || drivers === void 0 ? void 0 : drivers.length) / pageSize)
|
|
87
|
+
}));
|
|
88
|
+
};
|
|
89
|
+
(0, _react.useEffect)(function () {
|
|
90
|
+
if (drivers !== null && drivers !== void 0 && drivers.length) {
|
|
91
|
+
setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
|
|
92
|
+
totalItems: drivers === null || drivers === void 0 ? void 0 : drivers.length,
|
|
93
|
+
totalPages: Math.ceil((drivers === null || drivers === void 0 ? void 0 : drivers.length) / 10)
|
|
94
|
+
}));
|
|
95
|
+
}
|
|
96
|
+
}, [drivers]);
|
|
49
97
|
return /*#__PURE__*/_react.default.createElement(_styles.DriversListContainer, {
|
|
50
98
|
showCompressedInfo: showCompressedInfo
|
|
51
99
|
}, loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, _toConsumableArray(Array(10).keys()).map(function (i) {
|
|
@@ -59,7 +107,7 @@ var DriversList = exports.DriversList = function DriversList(props) {
|
|
|
59
107
|
})), /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
|
|
60
108
|
width: 100
|
|
61
109
|
})));
|
|
62
|
-
})) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (
|
|
110
|
+
})) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, drivers.filter(filterFunction).map(function (driver) {
|
|
63
111
|
return /*#__PURE__*/_react.default.createElement(_Driver.Driver, {
|
|
64
112
|
key: driver === null || driver === void 0 ? void 0 : driver.id,
|
|
65
113
|
driver: driver,
|
|
@@ -70,5 +118,11 @@ var DriversList = exports.DriversList = function DriversList(props) {
|
|
|
70
118
|
getStarWidth: _utils.getStarWidth,
|
|
71
119
|
showCompressedInfo: showCompressedInfo
|
|
72
120
|
});
|
|
121
|
+
})), (drivers === null || drivers === void 0 ? void 0 : drivers.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles.PaginationWrapper, null, /*#__PURE__*/_react.default.createElement(_Shared.Pagination, {
|
|
122
|
+
currentPage: pagination === null || pagination === void 0 ? void 0 : pagination.currentPage,
|
|
123
|
+
totalPages: pagination === null || pagination === void 0 ? void 0 : pagination.totalPages,
|
|
124
|
+
handleChangePage: handleChangePage,
|
|
125
|
+
handleChangePageSize: handleChangePageSize,
|
|
126
|
+
defaultPageSize: pagination === null || pagination === void 0 ? void 0 : pagination.pageSize
|
|
73
127
|
})));
|
|
74
128
|
};
|