ordering-ui-admin-external 1.45.1 → 1.45.3

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.
Files changed (9) hide show
  1. package/_bundles/{ordering-ui-admin.f268db8e33337ae4b89e.js → ordering-ui-admin.7b793b7424f41d9bb178.js} +2 -2
  2. package/_modules/components/Delivery/UsersList/index.js +4 -10
  3. package/_modules/components/Shared/Schedule/index.js +17 -6
  4. package/_modules/components/Shared/Schedule/styles.js +19 -14
  5. package/package.json +1 -1
  6. package/src/components/Delivery/UsersList/index.js +3 -16
  7. package/src/components/Shared/Schedule/index.js +141 -138
  8. package/src/components/Shared/Schedule/styles.js +82 -11
  9. /package/_bundles/{ordering-ui-admin.f268db8e33337ae4b89e.js.LICENSE.txt → ordering-ui-admin.7b793b7424f41d9bb178.js.LICENSE.txt} +0 -0
package/_modules/components/Delivery/UsersList/index.js CHANGED
@@ -163,7 +163,7 @@ var UsersList = exports.UsersList = function UsersList(props) {
163
163
  pageSize: paginationProps.pageSize
164
164
  });
165
165
  }, [paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.currentPage, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.pageSize, paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.totalPages]);
166
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersConatiner, null, /*#__PURE__*/_react.default.createElement(_styles2.UserTableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, isDriversPage && /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.UserIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
166
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersConatiner, null, /*#__PURE__*/_react.default.createElement(_styles2.UserTableWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.UsersTable, null, /*#__PURE__*/_react.default.createElement("thead", null, /*#__PURE__*/_react.default.createElement("tr", null, (isDriversPage || isDriversManagersPage) && /*#__PURE__*/_react.default.createElement("th", null, /*#__PURE__*/_react.default.createElement(_styles2.UserIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
167
167
  className: "all-checkbox",
168
168
  isChecked: !(usersList !== null && usersList !== void 0 && usersList.loading) && isAllChecked,
169
169
  onClick: function onClick() {
@@ -174,7 +174,7 @@ var UsersList = exports.UsersList = function UsersList(props) {
174
174
  }, t('ACTION', 'Action')))), usersList.loading ? _toConsumableArray(Array(10).keys()).map(function (i) {
175
175
  return /*#__PURE__*/_react.default.createElement("tbody", {
176
176
  key: i
177
- }, /*#__PURE__*/_react.default.createElement("tr", null, isDriversPage && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.UserIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
177
+ }, /*#__PURE__*/_react.default.createElement("tr", null, (isDriversPage || isDriversManagersPage) && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.UserIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, null, /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
178
178
  width: 20,
179
179
  height: 20
180
180
  })), /*#__PURE__*/_react.default.createElement(_reactLoadingSkeleton.default, {
@@ -209,19 +209,13 @@ var UsersList = exports.UsersList = function UsersList(props) {
209
209
  onClick: function onClick(e) {
210
210
  return onChangeUserDetails(e, user);
211
211
  }
212
- }, isDriversPage && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.UserIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
212
+ }, (isDriversPage || isDriversManagersPage) && /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.UserIdWrapper, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
213
213
  className: "user_checkbox",
214
214
  isChecked: selectedUsers.includes(user.id),
215
215
  onClick: function onClick() {
216
216
  return handleSelectedUsers(user.id);
217
217
  }
218
- }, selectedUsers.includes(user.id) ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, null)), user === null || user === void 0 ? void 0 : user.id)), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.UserMainInfo, null, isDriversManagersPage && /*#__PURE__*/_react.default.createElement(_styles2.CheckBoxWrapper, {
219
- className: "user_checkbox",
220
- isChecked: selectedUsers.includes(user.id),
221
- onClick: function onClick() {
222
- return handleSelectedUsers(user.id);
223
- }
224
- }, selectedUsers.includes(user.id) ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, null)), /*#__PURE__*/_react.default.createElement(_styles2.WrapperImage, null, user !== null && user !== void 0 && user.photo ? /*#__PURE__*/_react.default.createElement(_styles2.Image, {
218
+ }, selectedUsers.includes(user.id) ? /*#__PURE__*/_react.default.createElement(_MdCheckBox.default, null) : /*#__PURE__*/_react.default.createElement(_MdCheckBoxOutlineBlank.default, null)), user === null || user === void 0 ? void 0 : user.id)), /*#__PURE__*/_react.default.createElement("td", null, /*#__PURE__*/_react.default.createElement(_styles2.UserMainInfo, null, /*#__PURE__*/_react.default.createElement(_styles2.WrapperImage, null, user !== null && user !== void 0 && user.photo ? /*#__PURE__*/_react.default.createElement(_styles2.Image, {
225
219
  bgimage: optimizeImage(user === null || user === void 0 ? void 0 : user.photo, 'h_50,c_limit')
226
220
  }) : /*#__PURE__*/_react.default.createElement(_FaUserAlt.default, null)), /*#__PURE__*/_react.default.createElement(_styles2.InfoBlock, null, /*#__PURE__*/_react.default.createElement("p", {
227
221
  className: "bold"
package/_modules/components/Shared/Schedule/index.js CHANGED
@@ -45,7 +45,8 @@ var ScheduleUI = function ScheduleUI(props) {
45
45
  handleSelectCopyTimes = props.handleSelectCopyTimes,
46
46
  handleApplyScheduleCopyTimes = props.handleApplyScheduleCopyTimes,
47
47
  isShowDate = props.isShowDate,
48
- disableSchedule = props.disableSchedule;
48
+ disableSchedule = props.disableSchedule,
49
+ useDaysAbbrevation = props.useDaysAbbrevation;
49
50
  var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
50
51
  _useLanguage2 = _slicedToArray(_useLanguage, 2),
51
52
  t = _useLanguage2[1];
@@ -77,7 +78,7 @@ var ScheduleUI = function ScheduleUI(props) {
77
78
  _useState6 = _slicedToArray(_useState5, 2),
78
79
  isOpenCopytimes = _useState6[0],
79
80
  setIsOpenCopytimes = _useState6[1];
80
- var daysOfWeek = [t('SUNDAY_ABBREVIATION', 'Sun'), t('MONDAY_ABBREVIATION', 'Mon'), t('TUESDAY_ABBREVIATION', 'Tue'), t('WEDNESDAY_ABBREVIATION', 'Wed'), t('THURSDAY_ABBREVIATION', 'Thu'), t('FRIDAY_ABBREVIATION', 'Fri'), t('SATURDAY_ABBREVIATION', 'Sat')];
81
+ var daysOfWeek = [t("SUNDAY".concat(useDaysAbbrevation ? '_ABBREVIATION' : ''), 'Sunday'), t("MONDAY".concat(useDaysAbbrevation ? '_ABBREVIATION' : ''), 'Monday'), t("TUESDAY".concat(useDaysAbbrevation ? '_ABBREVIATION' : ''), 'Tuesday'), t("WEDNESDAY".concat(useDaysAbbrevation ? '_ABBREVIATION' : ''), 'Wednesday'), t("THURSDAY".concat(useDaysAbbrevation ? '_ABBREVIATION' : ''), 'Thursday'), t("FRIDAY".concat(useDaysAbbrevation ? '_ABBREVIATION' : ''), 'Friday'), t("SATURDAY".concat(useDaysAbbrevation ? '_ABBREVIATION' : ''), 'Saturday')];
81
82
  var closeAlert = function closeAlert() {
82
83
  setIsConflict(false);
83
84
  setIsTimeChangeError(false);
@@ -145,7 +146,9 @@ var ScheduleUI = function ScheduleUI(props) {
145
146
  var _addScheduleTime$open, _addScheduleTime$open2, _addScheduleTime$clos, _addScheduleTime$clos2;
146
147
  return /*#__PURE__*/_react.default.createElement(_styles2.TimeScheduleItemContainer, {
147
148
  key: daysOfWeekIndex
148
- }, /*#__PURE__*/_react.default.createElement("div", null, !disableSchedule && /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
149
+ }, /*#__PURE__*/_react.default.createElement("div", {
150
+ className: "day-title"
151
+ }, !disableSchedule && /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
149
152
  checked: schedule === null || schedule === void 0 ? void 0 : schedule.enabled,
150
153
  onChange: function onChange(e) {
151
154
  return handleEnabledSchedule(daysOfWeekIndex, e.target.checked);
@@ -154,7 +157,11 @@ var ScheduleUI = function ScheduleUI(props) {
154
157
  className: "date"
155
158
  }, parseDate(getNextDate(daysOfWeekIndex), {
156
159
  outputFormat: 'YYYY-MM-DD'
157
- })))), schedule !== null && schedule !== void 0 && schedule.enabled ? /*#__PURE__*/_react.default.createElement("div", null, schedule === null || schedule === void 0 ? void 0 : schedule.lapses.map(function (lapse, index) {
160
+ })))), /*#__PURE__*/_react.default.createElement("div", {
161
+ className: "day-selector"
162
+ }, schedule !== null && schedule !== void 0 && schedule.enabled ? /*#__PURE__*/_react.default.createElement("div", {
163
+ className: "days"
164
+ }, schedule === null || schedule === void 0 ? void 0 : schedule.lapses.map(function (lapse, index) {
158
165
  var _lapse$open, _lapse$open2, _lapse$close, _lapse$close2;
159
166
  return /*#__PURE__*/_react.default.createElement("div", {
160
167
  key: index
@@ -237,7 +244,11 @@ var ScheduleUI = function ScheduleUI(props) {
237
244
  onClick: function onClick() {
238
245
  return handleOpenAddSchedule(null);
239
246
  }
240
- })))) : /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("p", null, t('UNAVAILABLE', 'Unavailable'))), !disableSchedule && /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_styles2.IconWrapper, {
247
+ })))) : /*#__PURE__*/_react.default.createElement("div", {
248
+ className: "days"
249
+ }, /*#__PURE__*/_react.default.createElement("p", null, t('UNAVAILABLE', 'Unavailable'))), !disableSchedule && /*#__PURE__*/_react.default.createElement("div", {
250
+ className: "icons"
251
+ }, /*#__PURE__*/_react.default.createElement(_styles2.IconWrapper, {
241
252
  isHide: !(schedule !== null && schedule !== void 0 && schedule.enabled)
242
253
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.PlusSquare, {
243
254
  onClick: function onClick() {
@@ -257,7 +268,7 @@ var ScheduleUI = function ScheduleUI(props) {
257
268
  return handleSelectCopyTimes(value);
258
269
  },
259
270
  handleApplyScheduleCopyTimes: handleApplyScheduleCopyTimes
260
- })));
271
+ }))));
261
272
  })), /*#__PURE__*/_react.default.createElement(_Confirm.Alert, {
262
273
  title: t('WEB_APPNAME', 'Ordering'),
263
274
  content: alertState.content,
package/_modules/components/Shared/Schedule/styles.js CHANGED
@@ -6,40 +6,45 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.TrashIconWrapper = exports.TimeScheduleItemContainer = exports.SplitLine = exports.SelectWrapper = exports.ScheduleContainer = exports.Option = exports.IconWrapper = exports.DateWrapper = exports.AddScheduleIconWrapper = void 0;
8
8
  var _styledComponents = _interopRequireWildcard(require("styled-components"));
9
- var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17;
9
+ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19;
10
10
  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); }
11
11
  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; }
12
12
  function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
13
13
  var ScheduleContainer = exports.ScheduleContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n min-width: 320px;\n"])));
14
- var TimeScheduleItemContainer = exports.TimeScheduleItemContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n display: flex;\n align-items: center;\n justify-content: space-between;\n padding: 12px 0;\n border-bottom: 1px solid ", ";\n\n > div {\n display: flex;\n align-items: center;\n h4 {\n font-size: 13px;\n font-weight: 600;\n margin: 0px;\n padding: 0 10px;\n }\n\n &:first-child {\n min-width: 70px;\n }\n\n &:nth-child(2) {\n flex-direction: column;\n flex: 1;\n > div {\n display: flex;\n justify-content: center;\n align-items: center;\n &:not(:last-child) {\n margin-bottom: 10px;\n }\n svg {\n font-size: 18px;\n cursor: pointer;\n }\n }\n > p {\n margin: 6px 0;\n font-size: 13px;\n }\n }\n\n &:nth-child(3) {\n > span {\n svg {\n cursor: pointer;\n font-size: 18px;\n color: ", ";\n ", "\n }\n }\n }\n }\n\n @media (min-width: 450px) {\n > div {\n h4 {\n font-size: 14px;\n padding: 0 12px;\n }\n &:nth-child(2) {\n p {\n font-size: 14px;\n }\n svg {\n font-size: 20px;\n }\n }\n &:nth-child(3) {\n > span {\n svg {\n font-size: 20px;\n }\n }\n }\n }\n }\n"])), function (props) {
14
+ var TimeScheduleItemContainer = exports.TimeScheduleItemContainer = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n align-items: flex-start;\n justify-content: space-between;\n padding: 12px 0;\n border-bottom: 1px solid ", ";\n\n div.day-title {\n display: flex;\n align-items: center;\n padding: 10px 0 5px;\n\n h4 {\n font-size: 13px;\n font-weight: 600;\n margin: 0px;\n padding: 0 10px;\n }\n\n &:first-child {\n min-width: 70px;\n }\n\n &:nth-child(2) {\n flex-direction: column;\n flex: 1;\n > div {\n display: flex;\n justify-content: center;\n align-items: center;\n &:not(:last-child) {\n margin-bottom: 10px;\n }\n svg {\n font-size: 18px;\n cursor: pointer;\n }\n }\n > p {\n margin: 6px 0;\n font-size: 13px;\n }\n }\n\n &:nth-child(3) {\n > span {\n svg {\n cursor: pointer;\n font-size: 18px;\n color: ", ";\n ", "\n }\n }\n }\n }\n\n div.day-selector {\n display: flex;\n align-items: center;\n padding: 5px 0 10px;\n\n width: 100%;\n justify-content: space-between;\n\n .days {\n flex-direction: column;\n\n > div {\n display: flex;\n flex-direction: row;\n justify-content: center;\n align-items: center;\n\n svg {\n font-size: 18px;\n cursor: pointer;\n }\n }\n > p {\n margin: 6px 0;\n font-size: 13px;\n }\n }\n\n .icons {\n display: flex;\n align-items: center;\n margin-right: 15px;\n > span {\n svg {\n cursor: pointer;\n font-size: 18px;\n color: ", ";\n ", "\n }\n }\n }\n }\n\n @media (min-width: 450px) {\n div.day-title {\n h4 {\n font-size: 14px;\n padding: 0 12px;\n }\n &:nth-child(2) {\n p {\n font-size: 14px;\n }\n svg {\n font-size: 20px;\n }\n }\n &:nth-child(3) {\n > span {\n svg {\n font-size: 20px;\n }\n }\n }\n }\n\n div.day-selector {\n .days {\n p {\n font-size: 14px;\n }\n svg {\n font-size: 20px;\n }\n }\n .icons {\n > span {\n svg {\n font-size: 20px;\n }\n }\n }\n }\n }\n"])), function (props) {
15
15
  return props.theme.colors.borderColor;
16
16
  }, function (props) {
17
17
  return props.theme.colors.primary;
18
18
  }, function (props) {
19
19
  var _props$theme;
20
- return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n margin-left: 10px;\n "]))) : (0, _styledComponents.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n margin-right: 10px;\n "])));
20
+ return (_props$theme = props.theme) !== null && _props$theme !== void 0 && _props$theme.rtl ? (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n margin-left: 10px;\n "]))) : (0, _styledComponents.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n margin-right: 10px;\n "])));
21
+ }, function (props) {
22
+ return props.theme.colors.primary;
23
+ }, function (props) {
24
+ var _props$theme2;
25
+ return (_props$theme2 = props.theme) !== null && _props$theme2 !== void 0 && _props$theme2.rtl ? (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n margin-left: 10px;\n "]))) : (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n margin-right: 10px;\n "])));
21
26
  });
22
- var SelectWrapper = exports.SelectWrapper = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n border: 1px solid ", ";\n border-radius: 8px;\n width: 70px;\n display: flex;\n justify-content: center;\n .select {\n border: none;\n svg {\n display: none;\n }\n > div {\n padding-left: 13px;\n padding-right: 13px;\n font-size: 13px;\n > div:last-child {\n margin: 0px;\n }\n }\n }\n\n .list {\n .options {\n > div {\n > div {\n min-width: initial;\n }\n }\n }\n }\n\n @media (min-width: 450px) {\n width: 70px;\n margin: 0px 5px;\n .select {\n > div {\n font-size: 16px;\n }\n }\n }\n"])), function (props) {
27
+ var SelectWrapper = exports.SelectWrapper = _styledComponents.default.div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n border: 1px solid ", ";\n border-radius: 8px;\n width: min-content;\n display: flex;\n justify-content: center;\n .select {\n border: none;\n svg {\n display: none;\n }\n > div {\n padding-left: 13px;\n padding-right: 13px;\n font-size: 13px;\n > div:last-child {\n margin: 0px;\n }\n }\n }\n\n .list {\n .options {\n > div {\n > div {\n min-width: initial;\n }\n }\n }\n }\n\n @media (min-width: 450px) {\n width: 65px;\n margin: 5px;\n .select {\n > div {\n font-size: 16px;\n }\n }\n }\n"])), function (props) {
23
28
  return props.theme.colors.borderColor;
24
29
  });
25
- var Option = exports.Option = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n white-space: nowrap;\n font-size: 15px;\n"])));
26
- var SplitLine = exports.SplitLine = _styledComponents.default.div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n height: 1px;\n width: 8px;\n margin: 0 8px;\n background-color: ", ";\n"])), function (props) {
30
+ var Option = exports.Option = _styledComponents.default.div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n white-space: nowrap;\n font-size: 15px;\n"])));
31
+ var SplitLine = exports.SplitLine = _styledComponents.default.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n height: 1px;\n width: 8px;\n margin: 0 8px;\n background-color: ", ";\n"])), function (props) {
27
32
  return props.theme.colors.disabled;
28
33
  });
29
- var IconWrapper = exports.IconWrapper = _styledComponents.default.span(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n ", "\n"])), function (_ref) {
34
+ var IconWrapper = exports.IconWrapper = _styledComponents.default.span(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n ", "\n"])), function (_ref) {
30
35
  var isHide = _ref.isHide;
31
- return isHide ? (0, _styledComponents.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n opacity: 0;\n pointer-events: none;\n "]))) : (0, _styledComponents.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n opacity: 1;\n "])));
36
+ return isHide ? (0, _styledComponents.css)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n opacity: 0;\n pointer-events: none;\n "]))) : (0, _styledComponents.css)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n opacity: 1;\n "])));
32
37
  });
33
- var TrashIconWrapper = exports.TrashIconWrapper = _styledComponents.default.div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: center;\n width: 50px;\n ", "\n @media (min-width: 450px) {\n width: 56px;\n }\n"])), function (_ref2) {
38
+ var TrashIconWrapper = exports.TrashIconWrapper = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: center;\n width: 50px;\n ", "\n @media (min-width: 450px) {\n width: 56px;\n }\n"])), function (_ref2) {
34
39
  var isHide = _ref2.isHide;
35
- return isHide ? (0, _styledComponents.css)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n opacity: 0;\n pointer-events: none;\n "]))) : (0, _styledComponents.css)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n opacity: 1;\n "])));
40
+ return isHide ? (0, _styledComponents.css)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n opacity: 0;\n pointer-events: none;\n "]))) : (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n opacity: 1;\n "])));
36
41
  });
37
- var AddScheduleIconWrapper = exports.AddScheduleIconWrapper = _styledComponents.default.div(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: center;\n width: 50px;\n > svg {\n color: ", ";\n ", "\n &:last-child {\n color: ", ";\n }\n }\n\n @media (min-width: 450px) {\n width: 56px;\n }\n"])), function (props) {
42
+ var AddScheduleIconWrapper = exports.AddScheduleIconWrapper = _styledComponents.default.div(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n display: flex;\n justify-content: center;\n width: 50px;\n > svg {\n color: ", ";\n ", "\n &:last-child {\n color: ", ";\n }\n }\n\n @media (min-width: 450px) {\n justify-content: flex-start;\n width: 56px;\n }\n"])), function (props) {
38
43
  return props.theme.colors.primary;
39
44
  }, function (props) {
40
- var _props$theme2;
41
- return (_props$theme2 = props.theme) !== null && _props$theme2 !== void 0 && _props$theme2.rtl ? (0, _styledComponents.css)(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n margin-right: 8px;\n "]))) : (0, _styledComponents.css)(_templateObject16 || (_templateObject16 = _taggedTemplateLiteral(["\n margin-left: 8px;\n "])));
45
+ var _props$theme3;
46
+ return (_props$theme3 = props.theme) !== null && _props$theme3 !== void 0 && _props$theme3.rtl ? (0, _styledComponents.css)(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n margin-right: 8px;\n "]))) : (0, _styledComponents.css)(_templateObject18 || (_templateObject18 = _taggedTemplateLiteral(["\n margin-left: 8px;\n "])));
42
47
  }, function (props) {
43
48
  return props.theme.colors.lightGray;
44
49
  });
45
- var DateWrapper = exports.DateWrapper = _styledComponents.default.div(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n\n h4 {\n &.date {\n font-weight: normal;\n }\n }\n"])));
50
+ var DateWrapper = exports.DateWrapper = _styledComponents.default.div(_templateObject19 || (_templateObject19 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n\n h4 {\n &.date {\n font-weight: normal;\n }\n }\n"])));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.45.01",
3
+ "version": "1.45.03",
4
4
  "description": "Ordering UI Admin Components",
5
5
  "main": "./_modules/index.js",
6
6
  "exports": {
package/src/components/Delivery/UsersList/index.js CHANGED
@@ -141,7 +141,7 @@ export const UsersList = (props) => {
141
141
  <UsersTable>
142
142
  <thead>
143
143
  <tr>
144
- {isDriversPage && (
144
+ {(isDriversPage || isDriversManagersPage) && (
145
145
  <th>
146
146
  <UserIdWrapper>
147
147
  <CheckBoxWrapper
@@ -168,7 +168,7 @@ export const UsersList = (props) => {
168
168
  [...Array(10).keys()].map(i => (
169
169
  <tbody key={i}>
170
170
  <tr>
171
- {isDriversPage && (
171
+ {(isDriversPage || isDriversManagersPage) && (
172
172
  <td>
173
173
  <UserIdWrapper>
174
174
  <CheckBoxWrapper>
@@ -210,7 +210,7 @@ export const UsersList = (props) => {
210
210
  <tr
211
211
  onClick={(e) => onChangeUserDetails(e, user)}
212
212
  >
213
- {isDriversPage && (
213
+ {(isDriversPage || isDriversManagersPage) && (
214
214
  <td>
215
215
  <UserIdWrapper>
216
216
  <CheckBoxWrapper
@@ -230,19 +230,6 @@ export const UsersList = (props) => {
230
230
  )}
231
231
  <td>
232
232
  <UserMainInfo>
233
- {isDriversManagersPage && (
234
- <CheckBoxWrapper
235
- className='user_checkbox'
236
- isChecked={selectedUsers.includes(user.id)}
237
- onClick={() => handleSelectedUsers(user.id)}
238
- >
239
- {selectedUsers.includes(user.id) ? (
240
- <MdCheckBox />
241
- ) : (
242
- <MdCheckBoxOutlineBlank />
243
- )}
244
- </CheckBoxWrapper>
245
- )}
246
233
  <WrapperImage>
247
234
  {user?.photo ? (
248
235
  <Image bgimage={optimizeImage(user?.photo, 'h_50,c_limit')} />
package/src/components/Shared/Schedule/index.js CHANGED
@@ -47,7 +47,8 @@ const ScheduleUI = (props) => {
47
47
  handleSelectCopyTimes,
48
48
  handleApplyScheduleCopyTimes,
49
49
  isShowDate,
50
- disableSchedule
50
+ disableSchedule,
51
+ useDaysAbbrevation
51
52
  } = props
52
53
 
53
54
  const [, t] = useLanguage()
@@ -64,13 +65,13 @@ const ScheduleUI = (props) => {
64
65
  const [isOpenCopytimes, setIsOpenCopytimes] = useState(null)
65
66
 
66
67
  const daysOfWeek = [
67
- t('SUNDAY_ABBREVIATION', 'Sun'),
68
- t('MONDAY_ABBREVIATION', 'Mon'),
69
- t('TUESDAY_ABBREVIATION', 'Tue'),
70
- t('WEDNESDAY_ABBREVIATION', 'Wed'),
71
- t('THURSDAY_ABBREVIATION', 'Thu'),
72
- t('FRIDAY_ABBREVIATION', 'Fri'),
73
- t('SATURDAY_ABBREVIATION', 'Sat')
68
+ t(`SUNDAY${useDaysAbbrevation ? '_ABBREVIATION' : ''}`, 'Sunday'),
69
+ t(`MONDAY${useDaysAbbrevation ? '_ABBREVIATION' : ''}`, 'Monday'),
70
+ t(`TUESDAY${useDaysAbbrevation ? '_ABBREVIATION' : ''}`, 'Tuesday'),
71
+ t(`WEDNESDAY${useDaysAbbrevation ? '_ABBREVIATION' : ''}`, 'Wednesday'),
72
+ t(`THURSDAY${useDaysAbbrevation ? '_ABBREVIATION' : ''}`, 'Thursday'),
73
+ t(`FRIDAY${useDaysAbbrevation ? '_ABBREVIATION' : ''}`, 'Friday'),
74
+ t(`SATURDAY${useDaysAbbrevation ? '_ABBREVIATION' : ''}`, 'Saturday')
74
75
  ]
75
76
 
76
77
  const closeAlert = () => {
@@ -142,7 +143,7 @@ const ScheduleUI = (props) => {
142
143
  <TimeScheduleItemContainer
143
144
  key={daysOfWeekIndex}
144
145
  >
145
- <div>
146
+ <div className='day-title'>
146
147
  {!disableSchedule && (
147
148
  <Checkbox
148
149
  checked={schedule?.enabled}
@@ -156,139 +157,141 @@ const ScheduleUI = (props) => {
156
157
  )}
157
158
  </DateWrapper>
158
159
  </div>
159
- {schedule?.enabled
160
- ? (
161
- <div>
162
- {schedule?.lapses.map((lapse, index) => (
163
- <div
164
- key={index}
165
- >
166
- <SelectWrapper>
167
- <DefaultSelect
168
- noSelected
169
- options={hourOptions.current}
170
- defaultValue={lapse?.open?.hour}
171
- onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, true, 'hour')}
172
- optionInnerMaxHeight='300px'
173
- />
174
- </SelectWrapper>
175
- <SelectWrapper>
176
- <DefaultSelect
177
- noSelected
178
- options={minuteOptions.current}
179
- defaultValue={lapse?.open?.minute}
180
- onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, true, 'minute')}
181
- optionInnerMaxHeight='300px'
182
- />
183
- </SelectWrapper>
184
- <SplitLine />
185
- <SelectWrapper>
186
- <DefaultSelect
187
- noSelected
188
- options={hourOptions.current}
189
- defaultValue={lapse?.close?.hour}
190
- onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, false, 'hour')}
191
- optionInnerMaxHeight='300px'
192
- />
193
- </SelectWrapper>
194
- <SelectWrapper>
195
- <DefaultSelect
196
- noSelected
197
- options={minuteOptions.current}
198
- defaultValue={lapse?.close?.minute}
199
- onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, false, 'minute')}
200
- optionInnerMaxHeight='300px'
201
- />
202
- </SelectWrapper>
203
- <TrashIconWrapper
204
- isHide={schedule?.lapses.length <= 1}
160
+ <div className='day-selector'>
161
+ {schedule?.enabled
162
+ ? (
163
+ <div className='days'>
164
+ {schedule?.lapses.map((lapse, index) => (
165
+ <div
166
+ key={index}
205
167
  >
206
- {!disableSchedule && (
207
- <Trash
208
- onClick={() => onClickDelete(daysOfWeekIndex, index)}
168
+ <SelectWrapper>
169
+ <DefaultSelect
170
+ noSelected
171
+ options={hourOptions.current}
172
+ defaultValue={lapse?.open?.hour}
173
+ onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, true, 'hour')}
174
+ optionInnerMaxHeight='300px'
209
175
  />
210
- )}
211
- </TrashIconWrapper>
212
- </div>
213
- ))}
214
- {openAddSchedule[daysOfWeekIndex] && (
215
- <div>
216
- <SelectWrapper>
217
- <DefaultSelect
218
- noSelected
219
- options={hourOptions.current}
220
- defaultValue={addScheduleTime?.open?.hour}
221
- onChange={val => handleChangeAddScheduleTime(val, true, 'hour')}
222
- optionInnerMaxHeight='300px'
223
- />
224
- </SelectWrapper>
225
- <SelectWrapper>
226
- <DefaultSelect
227
- noSelected
228
- options={minuteOptions.current}
229
- defaultValue={addScheduleTime?.open?.minute}
230
- onChange={val => handleChangeAddScheduleTime(val, true, 'minute')}
231
- optionInnerMaxHeight='300px'
232
- />
233
- </SelectWrapper>
234
- <SplitLine />
235
- <SelectWrapper>
236
- <DefaultSelect
237
- noSelected
238
- options={hourOptions.current}
239
- defaultValue={addScheduleTime?.close?.hour}
240
- onChange={val => handleChangeAddScheduleTime(val, false, 'hour')}
241
- optionInnerMaxHeight='300px'
242
- />
243
- </SelectWrapper>
244
- <SelectWrapper>
245
- <DefaultSelect
246
- noSelected
247
- options={minuteOptions.current}
248
- defaultValue={addScheduleTime?.close?.minute}
249
- onChange={val => handleChangeAddScheduleTime(val, false, 'minute')}
250
- optionInnerMaxHeight='300px'
251
- />
252
- </SelectWrapper>
253
- <AddScheduleIconWrapper>
254
- <PlusCircleFill
255
- onClick={() => handleAddSchedule(daysOfWeekIndex)}
256
- />
257
- <DashCircleFill
258
- onClick={() => handleOpenAddSchedule(null)}
259
- />
260
- </AddScheduleIconWrapper>
261
- </div>
262
- )}
263
- </div>
264
- )
265
- : (
266
- <div>
267
- <p>{t('UNAVAILABLE', 'Unavailable')}</p>
176
+ </SelectWrapper>
177
+ <SelectWrapper>
178
+ <DefaultSelect
179
+ noSelected
180
+ options={minuteOptions.current}
181
+ defaultValue={lapse?.open?.minute}
182
+ onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, true, 'minute')}
183
+ optionInnerMaxHeight='300px'
184
+ />
185
+ </SelectWrapper>
186
+ <SplitLine />
187
+ <SelectWrapper>
188
+ <DefaultSelect
189
+ noSelected
190
+ options={hourOptions.current}
191
+ defaultValue={lapse?.close?.hour}
192
+ onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, false, 'hour')}
193
+ optionInnerMaxHeight='300px'
194
+ />
195
+ </SelectWrapper>
196
+ <SelectWrapper>
197
+ <DefaultSelect
198
+ noSelected
199
+ options={minuteOptions.current}
200
+ defaultValue={lapse?.close?.minute}
201
+ onChange={val => handleChangeScheduleTime(val, daysOfWeekIndex, index, false, 'minute')}
202
+ optionInnerMaxHeight='300px'
203
+ />
204
+ </SelectWrapper>
205
+ <TrashIconWrapper
206
+ isHide={schedule?.lapses.length <= 1}
207
+ >
208
+ {!disableSchedule && (
209
+ <Trash
210
+ onClick={() => onClickDelete(daysOfWeekIndex, index)}
211
+ />
212
+ )}
213
+ </TrashIconWrapper>
214
+ </div>
215
+ ))}
216
+ {openAddSchedule[daysOfWeekIndex] && (
217
+ <div>
218
+ <SelectWrapper>
219
+ <DefaultSelect
220
+ noSelected
221
+ options={hourOptions.current}
222
+ defaultValue={addScheduleTime?.open?.hour}
223
+ onChange={val => handleChangeAddScheduleTime(val, true, 'hour')}
224
+ optionInnerMaxHeight='300px'
225
+ />
226
+ </SelectWrapper>
227
+ <SelectWrapper>
228
+ <DefaultSelect
229
+ noSelected
230
+ options={minuteOptions.current}
231
+ defaultValue={addScheduleTime?.open?.minute}
232
+ onChange={val => handleChangeAddScheduleTime(val, true, 'minute')}
233
+ optionInnerMaxHeight='300px'
234
+ />
235
+ </SelectWrapper>
236
+ <SplitLine />
237
+ <SelectWrapper>
238
+ <DefaultSelect
239
+ noSelected
240
+ options={hourOptions.current}
241
+ defaultValue={addScheduleTime?.close?.hour}
242
+ onChange={val => handleChangeAddScheduleTime(val, false, 'hour')}
243
+ optionInnerMaxHeight='300px'
244
+ />
245
+ </SelectWrapper>
246
+ <SelectWrapper>
247
+ <DefaultSelect
248
+ noSelected
249
+ options={minuteOptions.current}
250
+ defaultValue={addScheduleTime?.close?.minute}
251
+ onChange={val => handleChangeAddScheduleTime(val, false, 'minute')}
252
+ optionInnerMaxHeight='300px'
253
+ />
254
+ </SelectWrapper>
255
+ <AddScheduleIconWrapper>
256
+ <PlusCircleFill
257
+ onClick={() => handleAddSchedule(daysOfWeekIndex)}
258
+ />
259
+ <DashCircleFill
260
+ onClick={() => handleOpenAddSchedule(null)}
261
+ />
262
+ </AddScheduleIconWrapper>
263
+ </div>
264
+ )}
265
+ </div>
266
+ )
267
+ : (
268
+ <div className='days'>
269
+ <p>{t('UNAVAILABLE', 'Unavailable')}</p>
270
+ </div>
271
+ )}
272
+ {!disableSchedule && (
273
+ <div className='icons'>
274
+ <IconWrapper
275
+ isHide={!schedule?.enabled}
276
+ >
277
+ <PlusSquare
278
+ onClick={() => handleOpenAddSchedule(daysOfWeekIndex)}
279
+ />
280
+ </IconWrapper>
281
+ <ScheduleCopyTimes
282
+ disabled={!schedule?.enabled}
283
+ cleanSelectedCopyDays={cleanSelectedCopyDays}
284
+ open={isOpenCopytimes === daysOfWeekIndex}
285
+ daysOfWeekIndex={daysOfWeekIndex}
286
+ onClick={setIsOpenCopytimes}
287
+ onClose={() => setIsOpenCopytimes(null)}
288
+ selectedCopyDays={selectedCopyDays}
289
+ handleSelectDays={(value) => handleSelectCopyTimes(value)}
290
+ handleApplyScheduleCopyTimes={handleApplyScheduleCopyTimes}
291
+ />
268
292
  </div>
269
293
  )}
270
- {!disableSchedule && (
271
- <div>
272
- <IconWrapper
273
- isHide={!schedule?.enabled}
274
- >
275
- <PlusSquare
276
- onClick={() => handleOpenAddSchedule(daysOfWeekIndex)}
277
- />
278
- </IconWrapper>
279
- <ScheduleCopyTimes
280
- disabled={!schedule?.enabled}
281
- cleanSelectedCopyDays={cleanSelectedCopyDays}
282
- open={isOpenCopytimes === daysOfWeekIndex}
283
- daysOfWeekIndex={daysOfWeekIndex}
284
- onClick={setIsOpenCopytimes}
285
- onClose={() => setIsOpenCopytimes(null)}
286
- selectedCopyDays={selectedCopyDays}
287
- handleSelectDays={(value) => handleSelectCopyTimes(value)}
288
- handleApplyScheduleCopyTimes={handleApplyScheduleCopyTimes}
289
- />
290
- </div>
291
- )}
294
+ </div>
292
295
  </TimeScheduleItemContainer>
293
296
  ))}
294
297
  </ScheduleContainer>