ordering-ui-admin-external 1.43.24 → 1.43.27
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.eb576a9ca5d00ed4114c.js → ordering-ui-admin.8d98f68e3600ae0aa81d.js} +2 -2
- package/_modules/components/Delivery/DriversTimeDisplay/index.js +18 -3
- package/_modules/components/Delivery/DriversTimeDisplay/styles.js +35 -5
- package/_modules/components/Orders/AdminsSelector/index.js +1 -2
- package/_modules/components/Orders/DeliveriesManager/index.js +4 -2
- package/_modules/components/Shared/InputPhoneNumber/index.js +4 -0
- package/_modules/components/Users/UserAddForm/index.js +9 -0
- package/_modules/components/Users/UserFormDetails/index.js +12 -2
- package/_modules/styles/MultiSelect/index.js +1 -1
- package/package.json +2 -2
- package/src/components/Delivery/DriversTimeDisplay/index.js +30 -3
- package/src/components/Delivery/DriversTimeDisplay/styles.js +141 -1
- package/src/components/Orders/AdminsSelector/index.js +1 -2
- package/src/components/Orders/DeliveriesManager/index.js +3 -1
- package/src/components/Shared/InputPhoneNumber/index.js +3 -0
- package/src/components/Users/UserAddForm/index.js +6 -0
- package/src/components/Users/UserFormDetails/index.js +9 -3
- package/src/styles/MultiSelect/index.js +12 -10
- /package/_bundles/{ordering-ui-admin.eb576a9ca5d00ed4114c.js.LICENSE.txt → ordering-ui-admin.8d98f68e3600ae0aa81d.js.LICENSE.txt} +0 -0
|
@@ -19,6 +19,8 @@ var _rrule = require("rrule");
|
|
|
19
19
|
var _moment = _interopRequireDefault(require("moment"));
|
|
20
20
|
var _styles2 = require("./styles");
|
|
21
21
|
var _Select = require("../../../styles/Select");
|
|
22
|
+
var _DriverMultiSelector = require("../../Orders/DriverMultiSelector");
|
|
23
|
+
var _TiWarningOutline = _interopRequireDefault(require("@meronex/icons/ti/TiWarningOutline"));
|
|
22
24
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
23
25
|
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); }
|
|
24
26
|
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 && Object.prototype.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; }
|
|
@@ -35,7 +37,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
35
37
|
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; } }
|
|
36
38
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
37
39
|
var DriversTimeDisplayUI = function DriversTimeDisplayUI(props) {
|
|
38
|
-
var _configs$general_hour, _configs$general_hour2, _stackEventsState$eve;
|
|
40
|
+
var _configs$general_hour, _configs$general_hour2, _filterValues$driverI, _stackEventsState$eve;
|
|
39
41
|
var driversList = props.driversList,
|
|
40
42
|
paginationProps = props.paginationProps,
|
|
41
43
|
getDrivers = props.getDrivers,
|
|
@@ -75,7 +77,10 @@ var DriversTimeDisplayUI = function DriversTimeDisplayUI(props) {
|
|
|
75
77
|
handleSelectedUntilDate = props.handleSelectedUntilDate,
|
|
76
78
|
ruleState = props.ruleState,
|
|
77
79
|
setRuleState = props.setRuleState,
|
|
78
|
-
handleSetInitialStates = props.handleSetInitialStates
|
|
80
|
+
handleSetInitialStates = props.handleSetInitialStates,
|
|
81
|
+
filterValues = props.filterValues,
|
|
82
|
+
handleChangeDriver = props.handleChangeDriver,
|
|
83
|
+
handleClearFilters = props.handleClearFilters;
|
|
79
84
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
80
85
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
81
86
|
t = _useLanguage2[1];
|
|
@@ -377,7 +382,17 @@ var DriversTimeDisplayUI = function DriversTimeDisplayUI(props) {
|
|
|
377
382
|
changeDriverGroupState: changeDriverGroupState
|
|
378
383
|
}), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ChevronRight, null), /*#__PURE__*/_react.default.createElement("span", {
|
|
379
384
|
className: "calendar"
|
|
380
|
-
}, t('CALENDAR', 'Calendar')), selectedGroup && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ChevronRight, null), /*#__PURE__*/_react.default.createElement("span", null, selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.name)))), /*#__PURE__*/_react.default.createElement(_styles2.
|
|
385
|
+
}, t('CALENDAR', 'Calendar')), selectedGroup && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.ChevronRight, null), /*#__PURE__*/_react.default.createElement("span", null, selectedGroup === null || selectedGroup === void 0 ? void 0 : selectedGroup.name)))), (filterValues === null || filterValues === void 0 || (_filterValues$driverI = filterValues.driverIds) === null || _filterValues$driverI === void 0 ? void 0 : _filterValues$driverI.length) > 0 && /*#__PURE__*/_react.default.createElement(_styles2.WarningMessage, null, /*#__PURE__*/_react.default.createElement(_TiWarningOutline.default, null), /*#__PURE__*/_react.default.createElement("span", null, t('WARNING_FILTER_APPLIED', 'Filters applied. You may miss new orders.')), /*#__PURE__*/_react.default.createElement(_styles.LinkButton, {
|
|
386
|
+
onClick: function onClick() {
|
|
387
|
+
return handleClearFilters();
|
|
388
|
+
}
|
|
389
|
+
}, t('CLEAR_FILTERS', 'Clear filters'))), /*#__PURE__*/_react.default.createElement(_styles2.DriversGroupCalendarWrapper, null, selectedGroup && /*#__PURE__*/_react.default.createElement(_styles2.WrapperRow, {
|
|
390
|
+
wrapperWidth: 400
|
|
391
|
+
}, /*#__PURE__*/_react.default.createElement(_styles2.DriverMultiSelectorContainer, null, /*#__PURE__*/_react.default.createElement(_DriverMultiSelector.DriverMultiSelector, {
|
|
392
|
+
disableSocketRoomDriver: true,
|
|
393
|
+
filterValues: filterValues,
|
|
394
|
+
handleChangeDriver: handleChangeDriver
|
|
395
|
+
}))), /*#__PURE__*/_react.default.createElement(_AnalyticsCalendar.AnalyticsCalendar, _extends({}, props, {
|
|
381
396
|
handleChangeDate: handleChangeDate
|
|
382
397
|
})))))), /*#__PURE__*/_react.default.createElement(_UserList.DeliveryUsersListing, {
|
|
383
398
|
date: date,
|
|
@@ -4,10 +4,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
|
-
exports.WrapperPagination = exports.WrapperImage = exports.WeekHeader = exports.WeekDayCheckWrapper = exports.ViewButtonsWrapper = exports.VerifiedItemsContainer = exports.VerifiedItem = exports.UsersTable = exports.UsersListingContainer = exports.UsersConatiner = exports.UsersBottomContainer = exports.UserTypeWrapper = exports.UserTableWrapper = exports.UserRow = exports.UserName = exports.UserMainInfo = exports.UserIdWrapper = exports.UserEnableWrapper = exports.TimeOptions = exports.ThName = exports.ThId = exports.StackedBlock = exports.SplitLine = exports.SpinnerLoaderWrapper = exports.ShowBreakBlocksWrapper = exports.SelectsWrapper = exports.SelectWrapper = exports.SelectTitleWrappre = exports.SelectTitle = exports.RrulesListWrapper = exports.RrulesItem = exports.OrderStatusTypeSelectWrapper = exports.Option = exports.InfoBlock = exports.Image = exports.HoursHeader = exports.HeaderWrapper = exports.HeaderTitleContainer = exports.Header = exports.FormWrapper = exports.FormControl = exports.EventProfessionalPhoto = exports.EventContainer = exports.EmptyBlock = exports.DriversGroupFilterWrapper = exports.DriversGroupCalendarWrapper = exports.DriverGroupSelectorWrapper = exports.DriverGroupName = exports.DeleteWrapper = exports.DeleteButtons = exports.DeleteBlock = exports.DateBlockWrapper = exports.Container = exports.ChecksWrapper = exports.CheckBoxWrapper = exports.CalendarLabelContainer = exports.CalendarHeaderContainer = exports.ButtonsWrapper = exports.ButtonWrapper = exports.BlocksWrapper = exports.Block = exports.AnalyticsTimeZoneWrapper = exports.ActionsContainer = void 0;
|
|
7
|
+
exports.WrapperRow = exports.WrapperPagination = exports.WrapperImage = exports.WeekHeader = exports.WeekDayCheckWrapper = exports.WarningMessage = exports.ViewButtonsWrapper = exports.VerifiedItemsContainer = exports.VerifiedItem = exports.UsersTable = exports.UsersListingContainer = exports.UsersConatiner = exports.UsersBottomContainer = exports.UserTypeWrapper = exports.UserTableWrapper = exports.UserRow = exports.UserName = exports.UserMainInfo = exports.UserIdWrapper = exports.UserEnableWrapper = exports.TimeOptions = exports.ThName = exports.ThId = exports.StackedBlock = exports.SplitLine = exports.SpinnerLoaderWrapper = exports.ShowBreakBlocksWrapper = exports.SelectsWrapper = exports.SelectWrapper = exports.SelectTitleWrappre = exports.SelectTitle = exports.RrulesListWrapper = exports.RrulesItem = exports.OrderStatusTypeSelectWrapper = exports.Option = exports.InfoBlock = exports.Image = exports.HoursHeader = exports.HeaderWrapper = exports.HeaderTitleContainer = exports.Header = exports.FormWrapper = exports.FormControl = exports.EventProfessionalPhoto = exports.EventContainer = exports.EmptyBlock = exports.DriversGroupFilterWrapper = exports.DriversGroupCalendarWrapper = exports.DriverMultiSelectorContainer = exports.DriverGroupSelectorWrapper = exports.DriverGroupName = exports.DeleteWrapper = exports.DeleteButtons = exports.DeleteBlock = exports.DateBlockWrapper = exports.Container = exports.ChecksWrapper = exports.CheckBoxWrapper = exports.CalendarLabelContainer = exports.CalendarHeaderContainer = exports.ButtonsWrapper = exports.ButtonWrapper = exports.BlocksWrapper = exports.Block = exports.AnalyticsTimeZoneWrapper = exports.ActionsContainer = void 0;
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
var _styledComponents = _interopRequireWildcard(require("styled-components"));
|
|
10
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46, _templateObject47, _templateObject48, _templateObject49, _templateObject50, _templateObject51, _templateObject52, _templateObject53, _templateObject54, _templateObject55, _templateObject56, _templateObject57, _templateObject58, _templateObject59, _templateObject60, _templateObject61, _templateObject62, _templateObject63, _templateObject64, _templateObject65, _templateObject66, _templateObject67, _templateObject68, _templateObject69, _templateObject70, _templateObject71, _templateObject72, _templateObject73, _templateObject74, _templateObject75, _templateObject76, _templateObject77, _templateObject78, _templateObject79, _templateObject80, _templateObject81, _templateObject82, _templateObject83, _templateObject84, _templateObject85, _templateObject86, _templateObject87, _templateObject88, _templateObject89, _templateObject90, _templateObject91, _templateObject92;
|
|
10
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29, _templateObject30, _templateObject31, _templateObject32, _templateObject33, _templateObject34, _templateObject35, _templateObject36, _templateObject37, _templateObject38, _templateObject39, _templateObject40, _templateObject41, _templateObject42, _templateObject43, _templateObject44, _templateObject45, _templateObject46, _templateObject47, _templateObject48, _templateObject49, _templateObject50, _templateObject51, _templateObject52, _templateObject53, _templateObject54, _templateObject55, _templateObject56, _templateObject57, _templateObject58, _templateObject59, _templateObject60, _templateObject61, _templateObject62, _templateObject63, _templateObject64, _templateObject65, _templateObject66, _templateObject67, _templateObject68, _templateObject69, _templateObject70, _templateObject71, _templateObject72, _templateObject73, _templateObject74, _templateObject75, _templateObject76, _templateObject77, _templateObject78, _templateObject79, _templateObject80, _templateObject81, _templateObject82, _templateObject83, _templateObject84, _templateObject85, _templateObject86, _templateObject87, _templateObject88, _templateObject89, _templateObject90, _templateObject91, _templateObject92, _templateObject93, _templateObject94, _templateObject95, _templateObject96, _templateObject97, _templateObject98, _templateObject99, _templateObject100, _templateObject101, _templateObject102;
|
|
11
11
|
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); }
|
|
12
12
|
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 && Object.prototype.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; }
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
@@ -36,7 +36,7 @@ var EventContainer = exports.EventContainer = _styledComponents.default.div(_tem
|
|
|
36
36
|
}, function (props) {
|
|
37
37
|
return props.theme.colors.lightGray;
|
|
38
38
|
});
|
|
39
|
-
var HeaderWrapper = exports.HeaderWrapper = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n justify-content: space-between;\n width: 100%;\n"])));
|
|
39
|
+
var HeaderWrapper = exports.HeaderWrapper = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n justify-content: space-between;\n width: 100%;\n position: relative;\n"])));
|
|
40
40
|
var EventProfessionalPhoto = exports.EventProfessionalPhoto = _styledComponents.default.div(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n width: 32px;\n height: 32px;\n border-radius: 8px;\n box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.1);\n display: flex;\n align-items: center;\n justify-content: center;\n img {\n width: 100%;\n height: 100%;\n border-radius: 8px;\n object-fit: cover;\n }\n svg {\n width: 85%;\n height: 85%;\n }\n"])));
|
|
41
41
|
var Option = exports.Option = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n padding: 5px 10px;\n column-gap: 5px;\n\n p {\n margin: 0px;\n white-space: nowrap;\n font-size: 14px;\n line-height: 26px;\n color: ", ";\n }\n\n ", "\n"])), function (props) {
|
|
42
42
|
return props.theme.colors.secundaryContrast;
|
|
@@ -55,7 +55,7 @@ var OrderStatusTypeSelectWrapper = exports.OrderStatusTypeSelectWrapper = _style
|
|
|
55
55
|
var DriversGroupFilterWrapper = exports.DriversGroupFilterWrapper = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n > button {\n background: #F8F9FA;\n border-radius: 7.6px;\n padding: 7px 12px;\n font-size: 14px;\n color: #748194;\n border: none;\n }\n\n @media (min-width: 600px) {\n margin-left: 25px;\n ", "\n }\n"])), function (props) {
|
|
56
56
|
return props.theme.rtl && (0, _styledComponents.css)(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n margin-right: 25px;\n margin-left: 0;\n "])));
|
|
57
57
|
});
|
|
58
|
-
var DriversGroupCalendarWrapper = exports.DriversGroupCalendarWrapper = (0, _styledComponents.default)(DriversGroupFilterWrapper)(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n position: relative;\n
|
|
58
|
+
var DriversGroupCalendarWrapper = exports.DriversGroupCalendarWrapper = (0, _styledComponents.default)(DriversGroupFilterWrapper)(_templateObject21 || (_templateObject21 = _taggedTemplateLiteral(["\n position: relative;\n display: flex;\n > button {\n svg {\n font-size: 16px;\n margin-right: 12px;\n ", "\n }\n }\n\n @media only screen and (min-width: 374px) and (max-width: 450px) {\n .ordering-calendar {\n right: calc((100vw - 374px) / 2);\n }\n }\n"])), function (props) {
|
|
59
59
|
return props.theme.rtl && (0, _styledComponents.css)(_templateObject22 || (_templateObject22 = _taggedTemplateLiteral(["\n margin-left: 12px;\n margin-right: 0;\n "])));
|
|
60
60
|
});
|
|
61
61
|
var AnalyticsTimeZoneWrapper = exports.AnalyticsTimeZoneWrapper = (0, _styledComponents.default)(DriversGroupFilterWrapper)(_templateObject23 || (_templateObject23 = _taggedTemplateLiteral([""])));
|
|
@@ -195,4 +195,34 @@ var ShowBreakBlocksWrapper = exports.ShowBreakBlocksWrapper = _styledComponents.
|
|
|
195
195
|
var ChecksWrapper = exports.ChecksWrapper = _styledComponents.default.div(_templateObject89 || (_templateObject89 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: space-between;\n width: 100%;\n"])));
|
|
196
196
|
var SelectsWrapper = exports.SelectsWrapper = _styledComponents.default.div(_templateObject90 || (_templateObject90 = _taggedTemplateLiteral(["\n display: grid;\n grid-template-columns: repeat(2, 2fr);\n gap: 20px;\n"])));
|
|
197
197
|
var BlocksWrapper = exports.BlocksWrapper = _styledComponents.default.div(_templateObject91 || (_templateObject91 = _taggedTemplateLiteral(["\n display: flex;\n justifyContent: space-between;\n gap: 60px;\n"])));
|
|
198
|
-
var DateBlockWrapper = exports.DateBlockWrapper = _styledComponents.default.div(_templateObject92 || (_templateObject92 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n"])));
|
|
198
|
+
var DateBlockWrapper = exports.DateBlockWrapper = _styledComponents.default.div(_templateObject92 || (_templateObject92 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n"])));
|
|
199
|
+
var DriverMultiSelectorContainer = exports.DriverMultiSelectorContainer = _styledComponents.default.div(_templateObject93 || (_templateObject93 = _taggedTemplateLiteral(["\n > div {\n max-width: 400px;\n min-width: 150px;\n }\n"])));
|
|
200
|
+
var WrapperRow = exports.WrapperRow = _styledComponents.default.div(_templateObject94 || (_templateObject94 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n padding-bottom: 0px;\n\n & > div {\n height: 55px;\n max-width: 400px;\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) {
|
|
201
|
+
return props.theme.colors.secundary;
|
|
202
|
+
}, function (props) {
|
|
203
|
+
return props.theme.colors.headingColor;
|
|
204
|
+
}, function (_ref4) {
|
|
205
|
+
var isSelectedOrders = _ref4.isSelectedOrders;
|
|
206
|
+
return isSelectedOrders && (0, _styledComponents.css)(_templateObject95 || (_templateObject95 = _taggedTemplateLiteral(["\n flex-direction: column !important;\n padding: ", ";\n & > div {\n margin-top: 15px;\n }\n "])), !isSelectedOrders && '10px 15px 0 0px');
|
|
207
|
+
});
|
|
208
|
+
var WarningMessage = exports.WarningMessage = _styledComponents.default.div(_templateObject96 || (_templateObject96 = _taggedTemplateLiteral(["\n position: absolute;\n display: flex;\n align-items: center;\n z-index: 100;\n bottom: 20px;\n background: ", ";\n border: 1px solid ", ";\n box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.12);\n border-radius: 7.6px;\n padding: 0px 15px;\n box-sizing: border-box;\n margin: 10px 0px 0px 0px !important;\n\n right: 0px;\n ", "\n\n svg {\n font-size: 20px;\n color: ", ";\n }\n\n span {\n font-size: 12px;\n line-height: 18px;\n color: ", ";\n margin: 0 10px;\n flex: 1;\n }\n\n a {\n font-size: 12px;\n white-space: nowrap;\n }\n\n @media (min-width: 768px) {\n padding: 0px 20px;\n font-size: 14px;\n line-height: 24px;\n ", "\n ", "\n ", "\n\n span {\n white-space: nowrap;\n }\n }\n"])), function (props) {
|
|
209
|
+
return props.theme.colors.warning100;
|
|
210
|
+
}, function (props) {
|
|
211
|
+
return props.theme.colors.warning;
|
|
212
|
+
}, function (props) {
|
|
213
|
+
var _props$theme11;
|
|
214
|
+
return ((_props$theme11 = props.theme) === null || _props$theme11 === void 0 ? void 0 : _props$theme11.rtl) && (0, _styledComponents.css)(_templateObject97 || (_templateObject97 = _taggedTemplateLiteral(["\n left: 0px;\n right: initial;\n "])));
|
|
215
|
+
}, function (props) {
|
|
216
|
+
return props.theme.colors.warning;
|
|
217
|
+
}, function (props) {
|
|
218
|
+
return props.theme.colors.headingColor;
|
|
219
|
+
}, function (_ref5) {
|
|
220
|
+
var isLateralBar = _ref5.isLateralBar;
|
|
221
|
+
return isLateralBar ? (0, _styledComponents.css)(_templateObject98 || (_templateObject98 = _taggedTemplateLiteral(["\n right: 0px;\n "]))) : (0, _styledComponents.css)(_templateObject99 || (_templateObject99 = _taggedTemplateLiteral(["\n right: 0px;\n "])));
|
|
222
|
+
}, function (_ref6) {
|
|
223
|
+
var isLateralBar = _ref6.isLateralBar;
|
|
224
|
+
return isLateralBar ? (0, _styledComponents.css)(_templateObject100 || (_templateObject100 = _taggedTemplateLiteral(["\n bottom: -25px;\n "]))) : (0, _styledComponents.css)(_templateObject101 || (_templateObject101 = _taggedTemplateLiteral(["\n bottom: -35px;\n "])));
|
|
225
|
+
}, function (props) {
|
|
226
|
+
var _props$theme12;
|
|
227
|
+
return ((_props$theme12 = props.theme) === null || _props$theme12 === void 0 ? void 0 : _props$theme12.rtl) && (0, _styledComponents.css)(_templateObject102 || (_templateObject102 = _taggedTemplateLiteral(["\n left: 0px;\n right: initial;\n "])));
|
|
228
|
+
});
|
|
@@ -19,7 +19,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
19
19
|
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; } }
|
|
20
20
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
21
21
|
var AdminsSelector = exports.AdminsSelector = function AdminsSelector(props) {
|
|
22
|
-
var _adminsList$admins3;
|
|
23
22
|
var adminsList = props.adminsList,
|
|
24
23
|
defaultValue = props.defaultValue,
|
|
25
24
|
small = props.small,
|
|
@@ -82,7 +81,7 @@ var AdminsSelector = exports.AdminsSelector = function AdminsSelector(props) {
|
|
|
82
81
|
setAdminsMultiOptionList(_adminsOptionListTemp);
|
|
83
82
|
}
|
|
84
83
|
}, [adminsList, defaultValue, searchValue]);
|
|
85
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(adminsList !== null && adminsList !== void 0 && adminsList.loading)
|
|
84
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !(adminsList !== null && adminsList !== void 0 && adminsList.loading) ? /*#__PURE__*/_react.default.createElement(_MultiSelect.MultiSelect, {
|
|
86
85
|
defaultValue: filterValues.administratorIds,
|
|
87
86
|
placeholder: Placeholder,
|
|
88
87
|
options: adminsMultiOptionList,
|
|
@@ -46,7 +46,8 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
|
|
|
46
46
|
numberOfOrdersBySubstatus = props.numberOfOrdersBySubstatus,
|
|
47
47
|
timeStatus = props.timeStatus,
|
|
48
48
|
setTimeStatus = props.setTimeStatus,
|
|
49
|
-
isUseQuery = props.isUseQuery
|
|
49
|
+
isUseQuery = props.isUseQuery,
|
|
50
|
+
adminsList = props.adminsList;
|
|
50
51
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
51
52
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
52
53
|
t = _useLanguage2[1];
|
|
@@ -119,7 +120,8 @@ var DeliveriesManagerUI = function DeliveriesManagerUI(props) {
|
|
|
119
120
|
filterModalOpen: filterModalOpen,
|
|
120
121
|
setFilterModalOpen: setFilterModalOpen,
|
|
121
122
|
setTimeStatus: setTimeStatus,
|
|
122
|
-
setSlaSettingTime: setSlaSettingTime
|
|
123
|
+
setSlaSettingTime: setSlaSettingTime,
|
|
124
|
+
adminsList: adminsList
|
|
123
125
|
}), /*#__PURE__*/_react.default.createElement(_styles.OrdersContent, null, /*#__PURE__*/_react.default.createElement(_styles.WrapItemView, null, /*#__PURE__*/_react.default.createElement(_DeliveryDashboard.DeliveryDashboard, {
|
|
124
126
|
searchValue: searchValue,
|
|
125
127
|
filterValues: filterValues,
|
|
@@ -39,7 +39,11 @@ var InputPhoneNumber = exports.InputPhoneNumber = function InputPhoneNumber(prop
|
|
|
39
39
|
_useConfig2 = _slicedToArray(_useConfig, 1),
|
|
40
40
|
configs = _useConfig2[0].configs;
|
|
41
41
|
var isValidPhoneNumber = function isValidPhoneNumber(number) {
|
|
42
|
+
var _configs$validation_p, _configs$validation_p2;
|
|
42
43
|
if (!number) return;
|
|
44
|
+
if (!parseInt((_configs$validation_p = configs === null || configs === void 0 || (_configs$validation_p2 = configs.validation_phone_number_lib) === null || _configs$validation_p2 === void 0 ? void 0 : _configs$validation_p2.value) !== null && _configs$validation_p !== void 0 ? _configs$validation_p : 1, 10)) {
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
43
47
|
var numberParser = (0, _libphonenumberJs.default)(number);
|
|
44
48
|
return numberParser === null || numberParser === void 0 ? void 0 : numberParser.isValid();
|
|
45
49
|
};
|
|
@@ -12,6 +12,7 @@ var _styles = require("../../../styles");
|
|
|
12
12
|
var _Shared = require("../../Shared");
|
|
13
13
|
var _UserTypeSelector = require("../UserTypeSelector");
|
|
14
14
|
var _libphonenumberJs = _interopRequireDefault(require("libphonenumber-js"));
|
|
15
|
+
var _reactPhoneNumberInput = require("react-phone-number-input");
|
|
15
16
|
var _utils = require("../../../utils");
|
|
16
17
|
var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skeleton"));
|
|
17
18
|
var _BiImage = _interopRequireDefault(require("@meronex/icons/bi/BiImage"));
|
|
@@ -55,6 +56,9 @@ var UserAddFormUI = function UserAddFormUI(props) {
|
|
|
55
56
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
56
57
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
57
58
|
t = _useLanguage2[1];
|
|
59
|
+
var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
|
|
60
|
+
_useConfig2 = _slicedToArray(_useConfig, 1),
|
|
61
|
+
configs = _useConfig2[0].configs;
|
|
58
62
|
var _useState = (0, _react.useState)(null),
|
|
59
63
|
_useState2 = _slicedToArray(_useState, 2),
|
|
60
64
|
isValidPhoneNumber = _useState2[0],
|
|
@@ -163,7 +167,12 @@ var UserAddFormUI = function UserAddFormUI(props) {
|
|
|
163
167
|
}
|
|
164
168
|
};
|
|
165
169
|
if (isValid) {
|
|
170
|
+
var _configs$validation_p, _configs$validation_p2;
|
|
166
171
|
phoneNumberParser = (0, _libphonenumberJs.default)(number);
|
|
172
|
+
if (!parseInt((_configs$validation_p = configs === null || configs === void 0 || (_configs$validation_p2 = configs.validation_phone_number_lib) === null || _configs$validation_p2 === void 0 ? void 0 : _configs$validation_p2.value) !== null && _configs$validation_p !== void 0 ? _configs$validation_p : 1, 10)) {
|
|
173
|
+
var _phoneNumberParser;
|
|
174
|
+
if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number);
|
|
175
|
+
}
|
|
167
176
|
}
|
|
168
177
|
if (phoneNumberParser) {
|
|
169
178
|
phoneNumber = {
|
|
@@ -10,6 +10,7 @@ var _reactLoadingSkeleton = _interopRequireDefault(require("react-loading-skelet
|
|
|
10
10
|
var _orderingComponentsAdminExternal = require("ordering-components-admin-external");
|
|
11
11
|
var _reactHookForm = require("react-hook-form");
|
|
12
12
|
var _libphonenumberJs = _interopRequireDefault(require("libphonenumber-js"));
|
|
13
|
+
var _reactPhoneNumberInput = require("react-phone-number-input");
|
|
13
14
|
var _Shared = require("../../Shared");
|
|
14
15
|
var _utils = require("../../../utils");
|
|
15
16
|
var _styles = require("../../../styles");
|
|
@@ -52,6 +53,9 @@ var UserFormDetailsUI = exports.UserFormDetailsUI = function UserFormDetailsUI(p
|
|
|
52
53
|
var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
|
|
53
54
|
_useLanguage2 = _slicedToArray(_useLanguage, 2),
|
|
54
55
|
t = _useLanguage2[1];
|
|
56
|
+
var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
|
|
57
|
+
_useConfig2 = _slicedToArray(_useConfig, 1),
|
|
58
|
+
configs = _useConfig2[0].configs;
|
|
55
59
|
var _useState = (0, _react.useState)(null),
|
|
56
60
|
_useState2 = _slicedToArray(_useState, 2),
|
|
57
61
|
isValidPhoneNumber = _useState2[0],
|
|
@@ -167,17 +171,23 @@ var UserFormDetailsUI = exports.UserFormDetailsUI = function UserFormDetailsUI(p
|
|
|
167
171
|
}
|
|
168
172
|
};
|
|
169
173
|
if (isValid) {
|
|
174
|
+
var _configs$validation_p, _configs$validation_p2;
|
|
170
175
|
phoneNumberParser = (0, _libphonenumberJs.default)(number);
|
|
176
|
+
if (!parseInt((_configs$validation_p = configs === null || configs === void 0 || (_configs$validation_p2 = configs.validation_phone_number_lib) === null || _configs$validation_p2 === void 0 ? void 0 : _configs$validation_p2.value) !== null && _configs$validation_p !== void 0 ? _configs$validation_p : 1, 10)) {
|
|
177
|
+
var _phoneNumberParser;
|
|
178
|
+
if ((_phoneNumberParser = phoneNumberParser) !== null && _phoneNumberParser !== void 0 && _phoneNumberParser.nationalNumber) phoneNumberParser.nationalNumber = (0, _reactPhoneNumberInput.formatPhoneNumber)(number);
|
|
179
|
+
}
|
|
171
180
|
}
|
|
172
181
|
if (phoneNumberParser) {
|
|
182
|
+
var _phoneNumberParser2, _phoneNumberParser3;
|
|
173
183
|
phoneNumber = {
|
|
174
184
|
country_phone_code: {
|
|
175
185
|
name: 'country_phone_code',
|
|
176
|
-
value: phoneNumberParser.countryCallingCode
|
|
186
|
+
value: (_phoneNumberParser2 = phoneNumberParser) === null || _phoneNumberParser2 === void 0 ? void 0 : _phoneNumberParser2.countryCallingCode
|
|
177
187
|
},
|
|
178
188
|
cellphone: {
|
|
179
189
|
name: 'cellphone',
|
|
180
|
-
value: phoneNumberParser.nationalNumber
|
|
190
|
+
value: (_phoneNumberParser3 = phoneNumberParser) === null || _phoneNumberParser3 === void 0 ? void 0 : _phoneNumberParser3.nationalNumber
|
|
181
191
|
}
|
|
182
192
|
};
|
|
183
193
|
}
|
|
@@ -116,7 +116,7 @@ var MultiSelect = exports.MultiSelect = function MultiSelect(props) {
|
|
|
116
116
|
}, /*#__PURE__*/_react.default.createElement(_Selects.Header, null, selectedOptions.map(function (selectedOption) {
|
|
117
117
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
|
|
118
118
|
key: selectedOption.value
|
|
119
|
-
}, /*#__PURE__*/_react.default.createElement(_Selects.MultiSelectOption, null, selectedOption.showOnSelected || selectedOption.content, /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
|
|
119
|
+
}, /*#__PURE__*/_react.default.createElement(_Selects.MultiSelectOption, null, selectedOption.showOnSelected || selectedOption.content, (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.value) !== 'default' && /*#__PURE__*/_react.default.createElement(_Buttons.Button, {
|
|
120
120
|
circle: true,
|
|
121
121
|
outline: true,
|
|
122
122
|
color: "primary",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-admin-external",
|
|
3
|
-
"version": "1.43.
|
|
3
|
+
"version": "1.43.27",
|
|
4
4
|
"description": "Ordering UI Admin Components",
|
|
5
5
|
"main": "./_modules/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"lodash": "^4.17.20",
|
|
84
84
|
"moment": "^2.29.1",
|
|
85
85
|
"moment-range": "^4.0.2",
|
|
86
|
-
"ordering-components-admin-external": "1.43.
|
|
86
|
+
"ordering-components-admin-external": "1.43.18",
|
|
87
87
|
"polished": "^3.6.7",
|
|
88
88
|
"prop-types": "^15.7.2",
|
|
89
89
|
"react-big-calendar": "^1.4.2",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useEffect, useState } from 'react'
|
|
2
2
|
import { useLanguage, useConfig, CalendarDriversList as CalendarDriversListController } from 'ordering-components-admin-external'
|
|
3
3
|
import { List as MenuIcon, ChevronRight } from 'react-bootstrap-icons'
|
|
4
|
-
import { Button, IconButton } from '../../../styles'
|
|
4
|
+
import { Button, IconButton, LinkButton } from '../../../styles'
|
|
5
5
|
import { useInfoShare } from '../../../contexts/InfoShareContext'
|
|
6
6
|
import { Alert, Modal, SpinnerLoader } from '../../Shared'
|
|
7
7
|
import { DeliveryUsersListing } from './UserList'
|
|
@@ -25,9 +25,14 @@ import {
|
|
|
25
25
|
DeleteButtons,
|
|
26
26
|
DeleteWrapper,
|
|
27
27
|
OrderStatusTypeSelectWrapper,
|
|
28
|
-
StackedBlock
|
|
28
|
+
StackedBlock,
|
|
29
|
+
DriverMultiSelectorContainer,
|
|
30
|
+
WrapperRow,
|
|
31
|
+
WarningMessage
|
|
29
32
|
} from './styles'
|
|
30
33
|
import { Select } from '../../../styles/Select'
|
|
34
|
+
import { DriverMultiSelector } from '../../Orders/DriverMultiSelector'
|
|
35
|
+
import TiWarningOutline from '@meronex/icons/ti/TiWarningOutline'
|
|
31
36
|
|
|
32
37
|
const DriversTimeDisplayUI = (props) => {
|
|
33
38
|
const {
|
|
@@ -70,7 +75,10 @@ const DriversTimeDisplayUI = (props) => {
|
|
|
70
75
|
handleSelectedUntilDate,
|
|
71
76
|
ruleState,
|
|
72
77
|
setRuleState,
|
|
73
|
-
handleSetInitialStates
|
|
78
|
+
handleSetInitialStates,
|
|
79
|
+
filterValues,
|
|
80
|
+
handleChangeDriver,
|
|
81
|
+
handleClearFilters
|
|
74
82
|
} = props
|
|
75
83
|
|
|
76
84
|
const [, t] = useLanguage()
|
|
@@ -400,7 +408,26 @@ const DriversTimeDisplayUI = (props) => {
|
|
|
400
408
|
)}
|
|
401
409
|
</DriverGroupSelectorWrapper>
|
|
402
410
|
</div>
|
|
411
|
+
|
|
412
|
+
{(filterValues?.driverIds?.length > 0) && (
|
|
413
|
+
<WarningMessage>
|
|
414
|
+
<TiWarningOutline />
|
|
415
|
+
<span>{t('WARNING_FILTER_APPLIED', 'Filters applied. You may miss new orders.')}</span>
|
|
416
|
+
<LinkButton onClick={() => handleClearFilters()}>{t('CLEAR_FILTERS', 'Clear filters')}</LinkButton>
|
|
417
|
+
</WarningMessage>
|
|
418
|
+
)}
|
|
403
419
|
<DriversGroupCalendarWrapper>
|
|
420
|
+
{selectedGroup && (
|
|
421
|
+
<WrapperRow wrapperWidth={400}>
|
|
422
|
+
<DriverMultiSelectorContainer>
|
|
423
|
+
<DriverMultiSelector
|
|
424
|
+
disableSocketRoomDriver
|
|
425
|
+
filterValues={filterValues}
|
|
426
|
+
handleChangeDriver={handleChangeDriver}
|
|
427
|
+
/>
|
|
428
|
+
</DriverMultiSelectorContainer>
|
|
429
|
+
</WrapperRow>
|
|
430
|
+
)}
|
|
404
431
|
<AnalyticsCalendar {...props} handleChangeDate={handleChangeDate} />
|
|
405
432
|
</DriversGroupCalendarWrapper>
|
|
406
433
|
</HeaderWrapper>
|
|
@@ -141,6 +141,7 @@ export const HeaderWrapper = styled.div`
|
|
|
141
141
|
align-items: center;
|
|
142
142
|
justify-content: space-between;
|
|
143
143
|
width: 100%;
|
|
144
|
+
position: relative;
|
|
144
145
|
`
|
|
145
146
|
|
|
146
147
|
export const EventProfessionalPhoto = styled.div`
|
|
@@ -224,7 +225,7 @@ export const DriversGroupFilterWrapper = styled.div`
|
|
|
224
225
|
|
|
225
226
|
export const DriversGroupCalendarWrapper = styled(DriversGroupFilterWrapper)`
|
|
226
227
|
position: relative;
|
|
227
|
-
|
|
228
|
+
display: flex;
|
|
228
229
|
> button {
|
|
229
230
|
svg {
|
|
230
231
|
font-size: 16px;
|
|
@@ -851,3 +852,142 @@ export const DateBlockWrapper = styled.div`
|
|
|
851
852
|
display: flex;
|
|
852
853
|
flex-direction: column;
|
|
853
854
|
`
|
|
855
|
+
|
|
856
|
+
export const DriverMultiSelectorContainer = styled.div`
|
|
857
|
+
> div {
|
|
858
|
+
max-width: 400px;
|
|
859
|
+
min-width: 150px;
|
|
860
|
+
}
|
|
861
|
+
`
|
|
862
|
+
|
|
863
|
+
export const WrapperRow = styled.div`
|
|
864
|
+
display: flex;
|
|
865
|
+
align-items: center;
|
|
866
|
+
padding-bottom: 0px;
|
|
867
|
+
|
|
868
|
+
& > div {
|
|
869
|
+
height: 55px;
|
|
870
|
+
max-width: 400px;
|
|
871
|
+
margin-right: 10px;
|
|
872
|
+
background-color: ${props => props.theme.colors.secundary};
|
|
873
|
+
border: none;
|
|
874
|
+
font-size: 14px;
|
|
875
|
+
border-radius: 8px;
|
|
876
|
+
> div:first-child {
|
|
877
|
+
height: 100%;
|
|
878
|
+
}
|
|
879
|
+
}
|
|
880
|
+
|
|
881
|
+
.order-status-multi-select {
|
|
882
|
+
p {
|
|
883
|
+
padding: 0;
|
|
884
|
+
color: ${props => props.theme.colors.headingColor} !important;
|
|
885
|
+
}
|
|
886
|
+
}
|
|
887
|
+
|
|
888
|
+
.date-filter-container {
|
|
889
|
+
z-index: 100;
|
|
890
|
+
}
|
|
891
|
+
|
|
892
|
+
input {
|
|
893
|
+
width: 100%;
|
|
894
|
+
height: 47px;
|
|
895
|
+
padding: 10px 25px;
|
|
896
|
+
box-sizing: border-box;
|
|
897
|
+
&::-webkit-outer-spin-button,
|
|
898
|
+
&::-webkit-inner-spin-button {
|
|
899
|
+
-webkit-appearance: none;
|
|
900
|
+
margin: 0;
|
|
901
|
+
}
|
|
902
|
+
-moz-appearance: textfield;
|
|
903
|
+
}
|
|
904
|
+
|
|
905
|
+
.close {
|
|
906
|
+
right: 8px;
|
|
907
|
+
}
|
|
908
|
+
|
|
909
|
+
.external_id {
|
|
910
|
+
@media (max-width: 1200px) {
|
|
911
|
+
flex: auto;
|
|
912
|
+
}
|
|
913
|
+
}
|
|
914
|
+
|
|
915
|
+
@media (max-width: 798px) {
|
|
916
|
+
flex-direction: column !important;
|
|
917
|
+
padding: 10px 15px 0 0px;
|
|
918
|
+
& > div {
|
|
919
|
+
margin-top: 15px;
|
|
920
|
+
}
|
|
921
|
+
}
|
|
922
|
+
|
|
923
|
+
${({ isSelectedOrders }) => isSelectedOrders && css`
|
|
924
|
+
flex-direction: column !important;
|
|
925
|
+
padding: ${!isSelectedOrders && '10px 15px 0 0px'};
|
|
926
|
+
& > div {
|
|
927
|
+
margin-top: 15px;
|
|
928
|
+
}
|
|
929
|
+
`}
|
|
930
|
+
`
|
|
931
|
+
|
|
932
|
+
export const WarningMessage = styled.div`
|
|
933
|
+
position: absolute;
|
|
934
|
+
display: flex;
|
|
935
|
+
align-items: center;
|
|
936
|
+
z-index: 100;
|
|
937
|
+
bottom: 20px;
|
|
938
|
+
background: ${props => props.theme.colors.warning100};
|
|
939
|
+
border: 1px solid ${props => props.theme.colors.warning};
|
|
940
|
+
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.12);
|
|
941
|
+
border-radius: 7.6px;
|
|
942
|
+
padding: 0px 15px;
|
|
943
|
+
box-sizing: border-box;
|
|
944
|
+
margin: 10px 0px 0px 0px !important;
|
|
945
|
+
|
|
946
|
+
right: 0px;
|
|
947
|
+
${props => props.theme?.rtl && css`
|
|
948
|
+
left: 0px;
|
|
949
|
+
right: initial;
|
|
950
|
+
`}
|
|
951
|
+
|
|
952
|
+
svg {
|
|
953
|
+
font-size: 20px;
|
|
954
|
+
color: ${props => props.theme.colors.warning};
|
|
955
|
+
}
|
|
956
|
+
|
|
957
|
+
span {
|
|
958
|
+
font-size: 12px;
|
|
959
|
+
line-height: 18px;
|
|
960
|
+
color: ${props => props.theme.colors.headingColor};
|
|
961
|
+
margin: 0 10px;
|
|
962
|
+
flex: 1;
|
|
963
|
+
}
|
|
964
|
+
|
|
965
|
+
a {
|
|
966
|
+
font-size: 12px;
|
|
967
|
+
white-space: nowrap;
|
|
968
|
+
}
|
|
969
|
+
|
|
970
|
+
@media (min-width: 768px) {
|
|
971
|
+
padding: 0px 20px;
|
|
972
|
+
font-size: 14px;
|
|
973
|
+
line-height: 24px;
|
|
974
|
+
${({ isLateralBar }) => isLateralBar ? css`
|
|
975
|
+
right: 0px;
|
|
976
|
+
` : css`
|
|
977
|
+
right: 0px;
|
|
978
|
+
`}
|
|
979
|
+
${({ isLateralBar }) => isLateralBar ? css`
|
|
980
|
+
bottom: -25px;
|
|
981
|
+
` : css`
|
|
982
|
+
bottom: -35px;
|
|
983
|
+
`}
|
|
984
|
+
${props => props.theme?.rtl && css`
|
|
985
|
+
left: 0px;
|
|
986
|
+
right: initial;
|
|
987
|
+
`}
|
|
988
|
+
|
|
989
|
+
span {
|
|
990
|
+
white-space: nowrap;
|
|
991
|
+
}
|
|
992
|
+
}
|
|
993
|
+
`
|
|
@@ -63,7 +63,7 @@ export const AdminsSelector = (props) => {
|
|
|
63
63
|
|
|
64
64
|
return (
|
|
65
65
|
<>
|
|
66
|
-
{!adminsList?.loading
|
|
66
|
+
{!adminsList?.loading ? (
|
|
67
67
|
<MultiSelect
|
|
68
68
|
defaultValue={filterValues.administratorIds}
|
|
69
69
|
placeholder={Placeholder}
|
|
@@ -94,4 +94,3 @@ export const AdminsSelector = (props) => {
|
|
|
94
94
|
</>
|
|
95
95
|
)
|
|
96
96
|
}
|
|
97
|
-
|
|
@@ -32,7 +32,8 @@ const DeliveriesManagerUI = (props) => {
|
|
|
32
32
|
numberOfOrdersBySubstatus,
|
|
33
33
|
timeStatus,
|
|
34
34
|
setTimeStatus,
|
|
35
|
-
isUseQuery
|
|
35
|
+
isUseQuery,
|
|
36
|
+
adminsList
|
|
36
37
|
} = props
|
|
37
38
|
|
|
38
39
|
const [, t] = useLanguage()
|
|
@@ -93,6 +94,7 @@ const DeliveriesManagerUI = (props) => {
|
|
|
93
94
|
setFilterModalOpen={setFilterModalOpen}
|
|
94
95
|
setTimeStatus={setTimeStatus}
|
|
95
96
|
setSlaSettingTime={setSlaSettingTime}
|
|
97
|
+
adminsList={adminsList}
|
|
96
98
|
/>
|
|
97
99
|
<OrdersContent>
|
|
98
100
|
<WrapItemView>
|
|
@@ -21,6 +21,9 @@ export const InputPhoneNumber = (props) => {
|
|
|
21
21
|
|
|
22
22
|
const isValidPhoneNumber = (number) => {
|
|
23
23
|
if (!number) return
|
|
24
|
+
if (!parseInt(configs?.validation_phone_number_lib?.value ?? 1, 10)) {
|
|
25
|
+
return true
|
|
26
|
+
}
|
|
24
27
|
const numberParser = parsePhoneNumber(number)
|
|
25
28
|
return numberParser?.isValid()
|
|
26
29
|
}
|
|
@@ -2,6 +2,7 @@ import React, { useState, useEffect, useRef } from 'react'
|
|
|
2
2
|
import { useForm } from 'react-hook-form'
|
|
3
3
|
import {
|
|
4
4
|
useLanguage,
|
|
5
|
+
useConfig,
|
|
5
6
|
DragAndDrop,
|
|
6
7
|
ExamineClick,
|
|
7
8
|
UserFormDetails as UserFormDetailsController
|
|
@@ -10,6 +11,7 @@ import { Input, Button } from '../../../styles'
|
|
|
10
11
|
import { Alert, InputPhoneNumber, Modal, ImageCrop } from '../../Shared'
|
|
11
12
|
import { UserTypeSelector } from '../UserTypeSelector'
|
|
12
13
|
import parsePhoneNumber from 'libphonenumber-js'
|
|
14
|
+
import { formatPhoneNumber } from 'react-phone-number-input'
|
|
13
15
|
import { sortInputFields, bytesConverter } from '../../../utils'
|
|
14
16
|
import Skeleton from 'react-loading-skeleton'
|
|
15
17
|
import BiImage from '@meronex/icons/bi/BiImage'
|
|
@@ -46,6 +48,7 @@ const UserAddFormUI = (props) => {
|
|
|
46
48
|
} = props
|
|
47
49
|
const formMethods = useForm()
|
|
48
50
|
const [, t] = useLanguage()
|
|
51
|
+
const [{ configs }] = useConfig()
|
|
49
52
|
|
|
50
53
|
const [isValidPhoneNumber, setIsValidPhoneNumber] = useState(null)
|
|
51
54
|
const [userPhoneNumber, setUserPhoneNumber] = useState(null)
|
|
@@ -133,6 +136,9 @@ const UserAddFormUI = (props) => {
|
|
|
133
136
|
}
|
|
134
137
|
if (isValid) {
|
|
135
138
|
phoneNumberParser = parsePhoneNumber(number)
|
|
139
|
+
if (!parseInt(configs?.validation_phone_number_lib?.value ?? 1, 10)) {
|
|
140
|
+
if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)
|
|
141
|
+
}
|
|
136
142
|
}
|
|
137
143
|
if (phoneNumberParser) {
|
|
138
144
|
phoneNumber = {
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import React, { useEffect, useState, useRef } from 'react'
|
|
2
2
|
import Skeleton from 'react-loading-skeleton'
|
|
3
|
-
import { useLanguage, useCustomer } from 'ordering-components-admin-external'
|
|
3
|
+
import { useLanguage, useCustomer, useConfig } from 'ordering-components-admin-external'
|
|
4
4
|
import { useForm } from 'react-hook-form'
|
|
5
5
|
import parsePhoneNumber from 'libphonenumber-js'
|
|
6
|
+
import { formatPhoneNumber } from 'react-phone-number-input'
|
|
6
7
|
import { Alert, InputPhoneNumber, RangeCalendar } from '../../Shared'
|
|
7
8
|
import { sortInputFields } from '../../../utils'
|
|
8
9
|
import { Switch, Input, Button } from '../../../styles'
|
|
@@ -43,6 +44,7 @@ export const UserFormDetailsUI = (props) => {
|
|
|
43
44
|
|
|
44
45
|
const formMethods = useForm()
|
|
45
46
|
const [, t] = useLanguage()
|
|
47
|
+
const [{ configs }] = useConfig()
|
|
46
48
|
|
|
47
49
|
const [isValidPhoneNumber, setIsValidPhoneNumber] = useState(null)
|
|
48
50
|
const [userPhoneNumber, setUserPhoneNumber] = useState(null)
|
|
@@ -143,16 +145,20 @@ export const UserFormDetailsUI = (props) => {
|
|
|
143
145
|
}
|
|
144
146
|
if (isValid) {
|
|
145
147
|
phoneNumberParser = parsePhoneNumber(number)
|
|
148
|
+
|
|
149
|
+
if (!parseInt(configs?.validation_phone_number_lib?.value ?? 1, 10)) {
|
|
150
|
+
if (phoneNumberParser?.nationalNumber) phoneNumberParser.nationalNumber = formatPhoneNumber(number)
|
|
151
|
+
}
|
|
146
152
|
}
|
|
147
153
|
if (phoneNumberParser) {
|
|
148
154
|
phoneNumber = {
|
|
149
155
|
country_phone_code: {
|
|
150
156
|
name: 'country_phone_code',
|
|
151
|
-
value: phoneNumberParser
|
|
157
|
+
value: phoneNumberParser?.countryCallingCode
|
|
152
158
|
},
|
|
153
159
|
cellphone: {
|
|
154
160
|
name: 'cellphone',
|
|
155
|
-
value: phoneNumberParser
|
|
161
|
+
value: phoneNumberParser?.nationalNumber
|
|
156
162
|
}
|
|
157
163
|
}
|
|
158
164
|
}
|