ordering-ui-admin-external 1.45.11 → 1.45.13

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.0b7eaacc326b00d92ca0.js → ordering-ui-admin.ff34c3a7adc77f7b03eb.js} +2 -2
  2. package/_modules/components/Delivery/UserDetails/index.js +13 -12
  3. package/_modules/components/Delivery/UserDetailsMenu/index.js +3 -0
  4. package/_modules/components/Orders/DeliveryDashboard/index.js +1 -4
  5. package/package.json +2 -2
  6. package/src/components/Delivery/UserDetails/index.js +1 -0
  7. package/src/components/Delivery/UserDetailsMenu/index.js +2 -1
  8. package/src/components/Orders/DeliveryDashboard/index.js +1 -4
  9. /package/_bundles/{ordering-ui-admin.0b7eaacc326b00d92ca0.js.LICENSE.txt → ordering-ui-admin.ff34c3a7adc77f7b03eb.js.LICENSE.txt} +0 -0
package/_modules/components/Delivery/UserDetails/index.js CHANGED
@@ -42,7 +42,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
42
42
  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; } }
43
43
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
44
44
  var UserDetailsUI = exports.UserDetailsUI = function UserDetailsUI(props) {
45
- var _configs$allow_driver, _configs$white_label_, _userState$user, _userState$user2, _userState$user3, _userState$user5, _userState$user7, _userState$user8, _userState$user9, _userState$user10, _userState$user11, _scheduleState$change, _userState$user12, _userState$user13, _userState$user14, _userState$user15, _userState$user16, _userState$user17;
45
+ var _configs$allow_driver, _configs$white_label_, _userState$user, _userState$user2, _userState$user3, _userState$user5, _userState$user7, _userState$user8, _userState$user9, _userState$user10, _userState$user11, _userState$user12, _scheduleState$change, _userState$user13, _userState$user14, _userState$user15, _userState$user16, _userState$user17, _userState$user18;
46
46
  var isDriversPage = props.isDriversPage,
47
47
  isDriversManagersPage = props.isDriversManagersPage,
48
48
  userState = props.userState,
@@ -163,17 +163,18 @@ var UserDetailsUI = exports.UserDetailsUI = function UserDetailsUI(props) {
163
163
  user: userState.user,
164
164
  handleSuccessUpdate: handleSuccessUserUpdate
165
165
  }), currentMenuSelected === 'driver_group' && /*#__PURE__*/_react.default.createElement(_DriverGroupSetting.DriverGroupSetting, {
166
- userId: userState === null || userState === void 0 || (_userState$user7 = userState.user) === null || _userState$user7 === void 0 ? void 0 : _userState$user7.id
167
- }), currentMenuSelected === 'saved_places' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (userState === null || userState === void 0 || (_userState$user8 = userState.user) === null || _userState$user8 === void 0 ? void 0 : _userState$user8.addresses) && /*#__PURE__*/_react.default.createElement(_styles3.SavedPlaces, null, /*#__PURE__*/_react.default.createElement(_AddressList.AddressList, {
166
+ userId: userState === null || userState === void 0 || (_userState$user7 = userState.user) === null || _userState$user7 === void 0 ? void 0 : _userState$user7.id,
167
+ isDriverManager: (userState === null || userState === void 0 || (_userState$user8 = userState.user) === null || _userState$user8 === void 0 ? void 0 : _userState$user8.level) === 5
168
+ }), currentMenuSelected === 'saved_places' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (userState === null || userState === void 0 || (_userState$user9 = userState.user) === null || _userState$user9 === void 0 ? void 0 : _userState$user9.addresses) && /*#__PURE__*/_react.default.createElement(_styles3.SavedPlaces, null, /*#__PURE__*/_react.default.createElement(_AddressList.AddressList, {
168
169
  isSeletectedUserAddresses: true,
169
- userId: (_userState$user9 = userState.user) === null || _userState$user9 === void 0 ? void 0 : _userState$user9.id,
170
- addresses: (_userState$user10 = userState.user) === null || _userState$user10 === void 0 ? void 0 : _userState$user10.addresses,
170
+ userId: (_userState$user10 = userState.user) === null || _userState$user10 === void 0 ? void 0 : _userState$user10.id,
171
+ addresses: (_userState$user11 = userState.user) === null || _userState$user11 === void 0 ? void 0 : _userState$user11.addresses,
171
172
  setExtraOpen: setExtraOpen,
172
173
  userState: userState,
173
174
  handleSuccessUpdate: handleSuccessUserUpdate
174
175
  }))), currentMenuSelected === 'schedule' && /*#__PURE__*/_react.default.createElement(_styles3.ScheduleSection, null, /*#__PURE__*/_react.default.createElement(_Shared.Schedule, {
175
176
  isShowDate: !!isDriversPage,
176
- scheduleList: userState === null || userState === void 0 || (_userState$user11 = userState.user) === null || _userState$user11 === void 0 ? void 0 : _userState$user11.schedule,
177
+ scheduleList: userState === null || userState === void 0 || (_userState$user12 = userState.user) === null || _userState$user12 === void 0 ? void 0 : _userState$user12.schedule,
177
178
  handleChangeScheduleState: handleScheduleState,
178
179
  disableSchedule: disableSchedule
179
180
  }), !disableSchedule && /*#__PURE__*/_react.default.createElement(_styles2.ActionsForm, null, /*#__PURE__*/_react.default.createElement(_styles.Button, {
@@ -188,18 +189,18 @@ var UserDetailsUI = exports.UserDetailsUI = function UserDetailsUI(props) {
188
189
  return handleScheduleUpdateUser();
189
190
  }
190
191
  }, scheduleState.loading ? t('UPDATING', 'Updating...') : t('UPDATE', 'Update')))), currentMenuSelected === 'logs' && /*#__PURE__*/_react.default.createElement(_DriversLogs.DriversLogs, {
191
- userId: (_userState$user12 = userState.user) === null || _userState$user12 === void 0 ? void 0 : _userState$user12.id,
192
+ userId: (_userState$user13 = userState.user) === null || _userState$user13 === void 0 ? void 0 : _userState$user13.id,
192
193
  UIComponent: _DriversGroupLogs.DriversGroupLogsUI
193
194
  }), currentMenuSelected === 'advanced_logs' && /*#__PURE__*/_react.default.createElement(_DriversAdvancedLogs.DriversAdvancedLogs, {
194
- userId: (_userState$user13 = userState.user) === null || _userState$user13 === void 0 ? void 0 : _userState$user13.id,
195
+ userId: (_userState$user14 = userState.user) === null || _userState$user14 === void 0 ? void 0 : _userState$user14.id,
195
196
  UIComponent: _DriversGroupLogs.DriversGroupLogsUI
196
197
  }), currentMenuSelected === 'orders' && /*#__PURE__*/_react.default.createElement(_OrdersManager.OrdersManager, {
197
198
  isSelectedOrders: true,
198
- customerId: (_userState$user14 = userState.user) === null || _userState$user14 === void 0 ? void 0 : _userState$user14.id,
199
+ customerId: (_userState$user15 = userState.user) === null || _userState$user15 === void 0 ? void 0 : _userState$user15.id,
199
200
  handleCustomOrderDetail: setExtraOpen
200
201
  }), currentMenuSelected === 'push_tokens' && /*#__PURE__*/_react.default.createElement(_Shared.PushTokens, {
201
- userId: userState === null || userState === void 0 || (_userState$user15 = userState.user) === null || _userState$user15 === void 0 ? void 0 : _userState$user15.id,
202
- pushTokens: (userState === null || userState === void 0 || (_userState$user16 = userState.user) === null || _userState$user16 === void 0 ? void 0 : _userState$user16.push_tokens) || []
202
+ userId: userState === null || userState === void 0 || (_userState$user16 = userState.user) === null || _userState$user16 === void 0 ? void 0 : _userState$user16.id,
203
+ pushTokens: (userState === null || userState === void 0 || (_userState$user17 = userState.user) === null || _userState$user17 === void 0 ? void 0 : _userState$user17.push_tokens) || []
203
204
  })), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
204
205
  width: "700px",
205
206
  height: "80vh",
@@ -210,7 +211,7 @@ var UserDetailsUI = exports.UserDetailsUI = function UserDetailsUI(props) {
210
211
  return setIsCustomField(false);
211
212
  }
212
213
  }, /*#__PURE__*/_react.default.createElement(_Users.UserMetaFields, {
213
- userId: (_userState$user17 = userState.user) === null || _userState$user17 === void 0 ? void 0 : _userState$user17.id
214
+ userId: (_userState$user18 = userState.user) === null || _userState$user18 === void 0 ? void 0 : _userState$user18.id
214
215
  })), /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
215
216
  width: "700px",
216
217
  height: "80vh",
package/_modules/components/Delivery/UserDetailsMenu/index.js CHANGED
@@ -52,6 +52,9 @@ var UserDetailsMenu = exports.UserDetailsMenu = function UserDetailsMenu(props)
52
52
  }, {
53
53
  key: 'saved_places',
54
54
  content: t('SAVED_PLACES', 'Saved places')
55
+ }, {
56
+ key: 'driver_group',
57
+ content: t('DRIVER_GROUP', 'Driver group')
55
58
  }
56
59
  // { key: 'metafields', content: t('METAFIELDS', 'Metafields') },
57
60
  // { key: 'personalization', content: t('PERSONALIZATION', 'Personalization') }
package/_modules/components/Orders/DeliveryDashboard/index.js CHANGED
@@ -35,8 +35,7 @@ var DeliveryDashboard = exports.DeliveryDashboard = function DeliveryDashboard(p
35
35
  handleSelectedSubOrderStatus = props.handleSelectedSubOrderStatus,
36
36
  ordersAmountByStatus = props.ordersAmountByStatus,
37
37
  setOrdersAmountByStatus = props.setOrdersAmountByStatus,
38
- isUseQuery = props.isUseQuery,
39
- setDetailsOrder = props.setDetailsOrder;
38
+ isUseQuery = props.isUseQuery;
40
39
  var ordersDashboardListProps = _objectSpread({}, props);
41
40
  var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
42
41
  _useConfig2 = _slicedToArray(_useConfig, 1),
@@ -54,10 +53,8 @@ var DeliveryDashboard = exports.DeliveryDashboard = function DeliveryDashboard(p
54
53
  var handleLocation = function handleLocation(order) {
55
54
  if ((interActionMapOrder === null || interActionMapOrder === void 0 ? void 0 : interActionMapOrder.id) === (order === null || order === void 0 ? void 0 : order.id)) {
56
55
  setInterActionMapOrder(null);
57
- setDetailsOrder(null);
58
56
  } else {
59
57
  setInterActionMapOrder(order);
60
- setDetailsOrder(order);
61
58
  }
62
59
  };
63
60
  return /*#__PURE__*/_react.default.createElement(_styles.DeliveryDashboardContainer, null, /*#__PURE__*/_react.default.createElement(_styles.OrdersContainer, null, /*#__PURE__*/_react.default.createElement(_styles.FilterContainer, null, /*#__PURE__*/_react.default.createElement(_OrderStatusFilterBar.OrderStatusFilterBar, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.45.11",
3
+ "version": "1.45.13",
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.67",
86
+ "ordering-components-admin-external": "1.43.68",
87
87
  "polished": "^3.6.7",
88
88
  "prop-types": "^15.7.2",
89
89
  "react-big-calendar": "^1.4.2",
package/src/components/Delivery/UserDetails/index.js CHANGED
@@ -160,6 +160,7 @@ export const UserDetailsUI = (props) => {
160
160
  {currentMenuSelected === 'driver_group' && (
161
161
  <DriverGroupSetting
162
162
  userId={userState?.user?.id}
163
+ isDriverManager={userState?.user?.level === 5}
163
164
  />
164
165
  )}
165
166
  {currentMenuSelected === 'saved_places' && (
package/src/components/Delivery/UserDetailsMenu/index.js CHANGED
@@ -27,7 +27,8 @@ export const UserDetailsMenu = (props) => {
27
27
  // { key: 'personalization', content: t('PERSONALIZATION', 'Personalization') }
28
28
  ] : [
29
29
  { key: 'profile', content: t('PROFILE', 'Profile') },
30
- { key: 'saved_places', content: t('SAVED_PLACES', 'Saved places') }
30
+ { key: 'saved_places', content: t('SAVED_PLACES', 'Saved places') },
31
+ { key: 'driver_group', content: t('DRIVER_GROUP', 'Driver group') }
31
32
  // { key: 'metafields', content: t('METAFIELDS', 'Metafields') },
32
33
  // { key: 'personalization', content: t('PERSONALIZATION', 'Personalization') }
33
34
  ]
package/src/components/Orders/DeliveryDashboard/index.js CHANGED
@@ -22,8 +22,7 @@ export const DeliveryDashboard = (props) => {
22
22
  handleSelectedSubOrderStatus,
23
23
  ordersAmountByStatus,
24
24
  setOrdersAmountByStatus,
25
- isUseQuery,
26
- setDetailsOrder
25
+ isUseQuery
27
26
  } = props
28
27
 
29
28
  const ordersDashboardListProps = {
@@ -45,10 +44,8 @@ export const DeliveryDashboard = (props) => {
45
44
  const handleLocation = (order) => {
46
45
  if (interActionMapOrder?.id === order?.id) {
47
46
  setInterActionMapOrder(null)
48
- setDetailsOrder(null)
49
47
  } else {
50
48
  setInterActionMapOrder(order)
51
- setDetailsOrder(order)
52
49
  }
53
50
  }
54
51