ordering-ui-admin-external 1.43.91 → 1.43.93

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 (7) hide show
  1. package/_bundles/{ordering-ui-admin.dc064962f316b673482a.js → ordering-ui-admin.498c6a8f3f5897d1875a.js} +2 -2
  2. package/_modules/components/Orders/OrdersDashboardControls/index.js +5 -1
  3. package/_modules/components/Stores/BusinessLocation/index.js +3 -3
  4. package/package.json +1 -1
  5. package/src/components/Orders/OrdersDashboardControls/index.js +16 -13
  6. package/src/components/Stores/BusinessLocation/index.js +1 -5
  7. /package/_bundles/{ordering-ui-admin.dc064962f316b673482a.js.LICENSE.txt → ordering-ui-admin.498c6a8f3f5897d1875a.js.LICENSE.txt} +0 -0
package/_modules/components/Orders/OrdersDashboardControls/index.js CHANGED
@@ -19,6 +19,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
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(r) { if (Array.isArray(r)) return r; }
21
21
  var OrdersDashboardControls = exports.OrdersDashboardControls = function OrdersDashboardControls(props) {
22
+ var _configs$allow_driver;
22
23
  var selectedOrderNumber = props.selectedOrderNumber,
23
24
  filterValues = props.filterValues,
24
25
  handleDeleteMultiOrders = props.handleDeleteMultiOrders,
@@ -31,6 +32,9 @@ var OrdersDashboardControls = exports.OrdersDashboardControls = function OrdersD
31
32
  var _useSession = (0, _orderingComponentsAdminExternal.useSession)(),
32
33
  _useSession2 = _slicedToArray(_useSession, 1),
33
34
  user = _useSession2[0].user;
35
+ var _useConfig = (0, _orderingComponentsAdminExternal.useConfig)(),
36
+ _useConfig2 = _slicedToArray(_useConfig, 1),
37
+ configs = _useConfig2[0].configs;
34
38
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.OrderDashboardControlsContainer, null, /*#__PURE__*/_react.default.createElement(_styles.InnerContnet, null, /*#__PURE__*/_react.default.createElement(_CreateCustomOrder.CreateCustomOrder, {
35
39
  handleOpenCustomOrderDetail: handleOpenCustomOrderDetail,
36
40
  handleOpenOrderDetail: handleOpenOrderDetail
@@ -41,7 +45,7 @@ var OrdersDashboardControls = exports.OrdersDashboardControls = function OrdersD
41
45
  franchiseId: franchiseId
42
46
  }), selectedOrderNumber > 0 && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (user === null || user === void 0 ? void 0 : user.level) !== 5 && /*#__PURE__*/_react.default.createElement(_OrderDelete.OrderDelete, {
43
47
  handleDeleteMultiOrders: handleDeleteMultiOrders
44
- }), /*#__PURE__*/_react.default.createElement(_styles.WrapOrderStatusTypeSelector, null, /*#__PURE__*/_react.default.createElement(_OrderStatusTypeSelector.OrderStatusTypeSelector, {
48
+ }), ((user === null || user === void 0 ? void 0 : user.level) !== 5 || (configs === null || configs === void 0 || (_configs$allow_driver = configs.allow_driver_manager_batch_update_order_status) === null || _configs$allow_driver === void 0 ? void 0 : _configs$allow_driver.value) === '1') && /*#__PURE__*/_react.default.createElement(_styles.WrapOrderStatusTypeSelector, null, /*#__PURE__*/_react.default.createElement(_OrderStatusTypeSelector.OrderStatusTypeSelector, {
45
49
  orderControl: true,
46
50
  isFirstSelect: true,
47
51
  noPadding: true,
package/_modules/components/Stores/BusinessLocation/index.js CHANGED
@@ -27,7 +27,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
27
27
  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; } }
28
28
  function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
29
29
  var BusinessLocation = exports.BusinessLocation = function BusinessLocation(props) {
30
- var _configs$google_maps_, _configs$google_maps_2, _ref2, _formState$changes$ti, _formState$changes, _formState$result, _formState$result2, _ref3, _formState$changes$ad, _formState$changes2, _configs$country_auto, _formState$result3, _formState$result4, _ref4, _formState$changes$ad2, _formState$changes3;
30
+ var _configs$google_maps_, _configs$google_maps_2, _ref2, _formState$changes$ti, _formState$changes, _ref3, _formState$changes$ad, _formState$changes2, _configs$country_auto, _formState$result, _formState$result2, _ref4, _formState$changes$ad2, _formState$changes3;
31
31
  var business = props.business,
32
32
  formState = props.formState,
33
33
  setFormState = props.setFormState,
@@ -176,7 +176,7 @@ var BusinessLocation = exports.BusinessLocation = function BusinessLocation(prop
176
176
  onChange: function onChange(e) {
177
177
  handleChangeInput(e.target.value);
178
178
  },
179
- defaultValue: formState !== null && formState !== void 0 && (_formState$result = formState.result) !== null && _formState$result !== void 0 && _formState$result.result ? formState === null || formState === void 0 || (_formState$result2 = formState.result) === null || _formState$result2 === void 0 || (_formState$result2 = _formState$result2.result) === null || _formState$result2 === void 0 ? void 0 : _formState$result2.address : (_ref3 = (_formState$changes$ad = formState === null || formState === void 0 || (_formState$changes2 = formState.changes) === null || _formState$changes2 === void 0 ? void 0 : _formState$changes2.address) !== null && _formState$changes$ad !== void 0 ? _formState$changes$ad : business === null || business === void 0 ? void 0 : business.address) !== null && _ref3 !== void 0 ? _ref3 : '',
179
+ defaultValue: (_ref3 = (_formState$changes$ad = formState === null || formState === void 0 || (_formState$changes2 = formState.changes) === null || _formState$changes2 === void 0 ? void 0 : _formState$changes2.address) !== null && _formState$changes$ad !== void 0 ? _formState$changes$ad : business === null || business === void 0 ? void 0 : business.address) !== null && _ref3 !== void 0 ? _ref3 : '',
180
180
  childRef: function childRef(ref) {
181
181
  googleInputRef.current = ref;
182
182
  },
@@ -184,7 +184,7 @@ var BusinessLocation = exports.BusinessLocation = function BusinessLocation(prop
184
184
  countryCode: (configs === null || configs === void 0 || (_configs$country_auto = configs.country_autocomplete) === null || _configs$country_auto === void 0 ? void 0 : _configs$country_auto.value) || '*'
185
185
  })), /*#__PURE__*/_react.default.createElement(_styles2.WrapperAddressnotes, null, /*#__PURE__*/_react.default.createElement("label", null, t('ADDRESS_NOTES', 'Address notes')), /*#__PURE__*/_react.default.createElement(_styles.TextArea, {
186
186
  rows: 4,
187
- defaultValue: formState !== null && formState !== void 0 && (_formState$result3 = formState.result) !== null && _formState$result3 !== void 0 && _formState$result3.result ? formState === null || formState === void 0 || (_formState$result4 = formState.result) === null || _formState$result4 === void 0 || (_formState$result4 = _formState$result4.result) === null || _formState$result4 === void 0 ? void 0 : _formState$result4.address_notes : (_ref4 = (_formState$changes$ad2 = formState === null || formState === void 0 || (_formState$changes3 = formState.changes) === null || _formState$changes3 === void 0 ? void 0 : _formState$changes3.address_notes) !== null && _formState$changes$ad2 !== void 0 ? _formState$changes$ad2 : business === null || business === void 0 ? void 0 : business.address_notes) !== null && _ref4 !== void 0 ? _ref4 : '',
187
+ defaultValue: formState !== null && formState !== void 0 && (_formState$result = formState.result) !== null && _formState$result !== void 0 && _formState$result.result ? formState === null || formState === void 0 || (_formState$result2 = formState.result) === null || _formState$result2 === void 0 || (_formState$result2 = _formState$result2.result) === null || _formState$result2 === void 0 ? void 0 : _formState$result2.address_notes : (_ref4 = (_formState$changes$ad2 = formState === null || formState === void 0 || (_formState$changes3 = formState.changes) === null || _formState$changes3 === void 0 ? void 0 : _formState$changes3.address_notes) !== null && _formState$changes$ad2 !== void 0 ? _formState$changes$ad2 : business === null || business === void 0 ? void 0 : business.address_notes) !== null && _ref4 !== void 0 ? _ref4 : '',
188
188
  onChange: function onChange(e) {
189
189
  return handleChangeTextarea(e.target.value);
190
190
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.43.91",
3
+ "version": "1.43.93",
4
4
  "description": "Ordering UI Admin Components",
5
5
  "main": "./_modules/index.js",
6
6
  "exports": {
package/src/components/Orders/OrdersDashboardControls/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import React from 'react'
2
- import { useSession } from 'ordering-components-admin-external'
2
+ import { useConfig, useSession } from 'ordering-components-admin-external'
3
3
  import { OrderStatusTypeSelector } from '../OrderStatusTypeSelector'
4
4
  import { OrdersExportCSV } from '../OrdersExportCSV'
5
5
  import { OrderDelete } from '../OrderDelete'
@@ -24,6 +24,7 @@ export const OrdersDashboardControls = (props) => {
24
24
  } = props
25
25
 
26
26
  const [{ user }] = useSession()
27
+ const [{ configs }] = useConfig()
27
28
 
28
29
  return (
29
30
  <>
@@ -43,18 +44,20 @@ export const OrdersDashboardControls = (props) => {
43
44
  handleDeleteMultiOrders={handleDeleteMultiOrders}
44
45
  />
45
46
  )}
46
- <WrapOrderStatusTypeSelector>
47
- <OrderStatusTypeSelector
48
- orderControl
49
- isFirstSelect
50
- noPadding
51
- mutiOrdersChange
52
- noSelected
53
- defaultValue='default'
54
- type='primary'
55
- handleChangeMultiOrdersStatus={handleChangeMultiOrdersStatus}
56
- />
57
- </WrapOrderStatusTypeSelector>
47
+ {(user?.level !== 5 || configs?.allow_driver_manager_batch_update_order_status?.value === '1') && (
48
+ <WrapOrderStatusTypeSelector>
49
+ <OrderStatusTypeSelector
50
+ orderControl
51
+ isFirstSelect
52
+ noPadding
53
+ mutiOrdersChange
54
+ noSelected
55
+ defaultValue='default'
56
+ type='primary'
57
+ handleChangeMultiOrdersStatus={handleChangeMultiOrdersStatus}
58
+ />
59
+ </WrapOrderStatusTypeSelector>
60
+ )}
58
61
  </>
59
62
  )}
60
63
  </InnerContnet>
package/src/components/Stores/BusinessLocation/index.js CHANGED
@@ -137,11 +137,7 @@ export const BusinessLocation = (props) => {
137
137
  onChange={(e) => {
138
138
  handleChangeInput(e.target.value)
139
139
  }}
140
- defaultValue={
141
- formState?.result?.result
142
- ? formState?.result?.result?.address
143
- : formState?.changes?.address ?? business?.address ?? ''
144
- }
140
+ defaultValue={formState?.changes?.address ?? business?.address ?? ''}
145
141
  childRef={(ref) => {
146
142
  googleInputRef.current = ref
147
143
  }}