ordering-ui-admin-external 1.31.0 → 1.31.1

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.2f5049887bf500c65392.js → ordering-ui-admin.b84e1f62fd043e740aba.js} +2 -2
  2. package/_modules/components/Delivery/DriversGroupAutoassign/index.js +14 -7
  3. package/_modules/components/Delivery/DriversGroupAutoassign/styles.js +5 -3
  4. package/package.json +2 -2
  5. package/src/components/Delivery/DriversGroupAutoassign/index.js +17 -6
  6. package/src/components/Delivery/DriversGroupAutoassign/styles.js +10 -0
  7. /package/_bundles/{ordering-ui-admin.2f5049887bf500c65392.js.LICENSE.txt → ordering-ui-admin.b84e1f62fd043e740aba.js.LICENSE.txt} +0 -0
package/_modules/components/Delivery/DriversGroupAutoassign/index.js CHANGED
@@ -26,7 +26,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
26
26
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
27
27
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
28
28
  var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
29
- var _theme$images$icons, _theme$images$icons2, _theme$images$icons3, _theme$images$icons4, _theme$images$icons5, _changesState$autoass, _ref, _changesState$autoass2, _ref2, _changesState$autoass3, _changesState$autoass4, _autoRejectOrderGroup, _autoRejectOrderGroup2, _autoRejectOrderGroup3, _ref3, _changesState$autoass5, _ref4, _changesState$autoass6, _ref5, _changesState$autoass7, _changesState$autoass8;
29
+ var _theme$images$icons, _theme$images$icons2, _theme$images$icons3, _theme$images$icons4, _theme$images$icons5, _changesState$autoass, _ref, _changesState$autoass2, _ref2, _changesState$autoass3, _changesState$autoass4, _changesState$autoass5, _autoRejectOrderGroup, _autoRejectOrderGroup2, _autoRejectOrderGroup3, _ref3, _changesState$autoass6, _ref4, _changesState$autoass7, _ref5, _changesState$autoass8, _changesState$autoass9;
30
30
  var autoAssign = props.autoAssign,
31
31
  autoRejectOrderGroup = props.autoRejectOrderGroup,
32
32
  onSelectAssign = props.onSelectAssign,
@@ -105,14 +105,21 @@ var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
105
105
  return handleChangeInput(e);
106
106
  },
107
107
  readOnly: ((changesState === null || changesState === void 0 ? void 0 : changesState.type) === 0 || typeof (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 'undefined' && (curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.type) === 0) && autoAssign <= 3
108
- }))), /*#__PURE__*/_react.default.createElement("div", null, autoAssign !== 2 && ((changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_amount_drivers) < 2 || typeof (changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_amount_drivers) === 'undefined' && (curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_amount_drivers) < 2) && /*#__PURE__*/_react.default.createElement(_styles2.CheckboxWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
108
+ }))), autoAssign !== 2 && ((changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_amount_drivers) < 2 || typeof (changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_amount_drivers) === 'undefined' && (curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_amount_drivers) < 2) && /*#__PURE__*/_react.default.createElement(_styles2.CheckboxContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.CheckboxWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
109
109
  checked: (_changesState$autoass4 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_autoaccept_by_driver) !== null && _changesState$autoass4 !== void 0 ? _changesState$autoass4 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_autoaccept_by_driver,
110
110
  onChange: function onChange(e) {
111
111
  return onChangeSave({
112
112
  autoassign_autoaccept_by_driver: e.target.checked
113
113
  });
114
114
  }
115
- }), /*#__PURE__*/_react.default.createElement("span", null, t('ORDER_CONFIRMED_ACCEPTED_BY_DRIVER', 'Accepted by Driver'))))), ((typeof (changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_autoaccept_by_driver) === 'undefined' ? !(curDriversGroup !== null && curDriversGroup !== void 0 && curDriversGroup.autoassign_autoaccept_by_driver) : !(changesState !== null && changesState !== void 0 && changesState.autoassign_autoaccept_by_driver)) || (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 1 || typeof (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 'undefined' && (curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.type) === 1) && /*#__PURE__*/_react.default.createElement(_styles2.FieldContainer, null, /*#__PURE__*/_react.default.createElement("label", null, t('AUTO_REJECT_ORDER_GROUP_AFTER', 'Auto reject Orders After')), /*#__PURE__*/_react.default.createElement(_styles2.InputsGroup, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
115
+ }), /*#__PURE__*/_react.default.createElement("span", null, t('ORDER_CONFIRMED_ACCEPTED_BY_DRIVER', 'Accepted by Driver'))), (typeof (changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_autoaccept_by_driver) === 'undefined' ? !(curDriversGroup !== null && curDriversGroup !== void 0 && curDriversGroup.autoassign_autoaccept_by_driver) : !(changesState !== null && changesState !== void 0 && changesState.autoassign_autoaccept_by_driver)) && /*#__PURE__*/_react.default.createElement(_styles2.CheckboxWrapper, null, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
116
+ checked: (_changesState$autoass5 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_autoassign_driver) !== null && _changesState$autoass5 !== void 0 ? _changesState$autoass5 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_autoassign_driver,
117
+ onChange: function onChange(e) {
118
+ return onChangeSave({
119
+ autoassign_autoassign_driver: e.target.checked
120
+ });
121
+ }
122
+ }), /*#__PURE__*/_react.default.createElement("span", null, t('AUTO_ASSIGNED', 'Auto assigned'))))), ((typeof (changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_autoaccept_by_driver) === 'undefined' ? !(curDriversGroup !== null && curDriversGroup !== void 0 && curDriversGroup.autoassign_autoaccept_by_driver) : !(changesState !== null && changesState !== void 0 && changesState.autoassign_autoaccept_by_driver)) && (typeof (changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_autoassign_driver) === 'undefined' ? !(curDriversGroup !== null && curDriversGroup !== void 0 && curDriversGroup.autoassign_autoassign_driver) : !(changesState !== null && changesState !== void 0 && changesState.autoassign_autoassign_driver)) || (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 1 || typeof (changesState === null || changesState === void 0 ? void 0 : changesState.type) === 'undefined' && (curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.type) === 1) && /*#__PURE__*/_react.default.createElement(_styles2.FieldContainer, null, /*#__PURE__*/_react.default.createElement("label", null, t('AUTO_REJECT_ORDER_GROUP_AFTER', 'Auto reject Orders After')), /*#__PURE__*/_react.default.createElement(_styles2.InputsGroup, null, /*#__PURE__*/_react.default.createElement(_styles.Input, {
116
123
  value: (_autoRejectOrderGroup = autoRejectOrderGroup === null || autoRejectOrderGroup === void 0 ? void 0 : autoRejectOrderGroup.hour) !== null && _autoRejectOrderGroup !== void 0 ? _autoRejectOrderGroup : '',
117
124
  onChange: function onChange(e) {
118
125
  return onChangeAutoRejectOrderGroup(e.target.value, 'hour');
@@ -133,7 +140,7 @@ var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
133
140
  isBlue: curArea === 1
134
141
  }, /*#__PURE__*/_react.default.createElement("label", null, t('INITIAL_RADIUS', 'Initial radius in meters')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
135
142
  name: "autoassign_initial_radius",
136
- value: (_ref3 = (_changesState$autoass5 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_initial_radius) !== null && _changesState$autoass5 !== void 0 ? _changesState$autoass5 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_initial_radius) !== null && _ref3 !== void 0 ? _ref3 : '',
143
+ value: (_ref3 = (_changesState$autoass6 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_initial_radius) !== null && _changesState$autoass6 !== void 0 ? _changesState$autoass6 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_initial_radius) !== null && _ref3 !== void 0 ? _ref3 : '',
137
144
  readOnly: autoAssign === 3,
138
145
  onFocus: function onFocus() {
139
146
  return setCurArea(1);
@@ -148,7 +155,7 @@ var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
148
155
  isGreen: curArea === 2
149
156
  }, /*#__PURE__*/_react.default.createElement("label", null, t('INCREMENT_RADIUS', 'Radius increase in meters')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
150
157
  name: "autoassign_increment_radius",
151
- value: (_ref4 = (_changesState$autoass6 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_increment_radius) !== null && _changesState$autoass6 !== void 0 ? _changesState$autoass6 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_increment_radius) !== null && _ref4 !== void 0 ? _ref4 : '',
158
+ value: (_ref4 = (_changesState$autoass7 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_increment_radius) !== null && _changesState$autoass7 !== void 0 ? _changesState$autoass7 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_increment_radius) !== null && _ref4 !== void 0 ? _ref4 : '',
152
159
  readOnly: autoAssign === 3,
153
160
  onFocus: function onFocus() {
154
161
  return setCurArea(2);
@@ -163,7 +170,7 @@ var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
163
170
  isPink: curArea === 3
164
171
  }, /*#__PURE__*/_react.default.createElement("label", null, t('MAX_RADIUS', 'Maximum radius in meters')), /*#__PURE__*/_react.default.createElement(_styles.Input, {
165
172
  name: "autoassign_max_radius",
166
- value: (_ref5 = (_changesState$autoass7 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_max_radius) !== null && _changesState$autoass7 !== void 0 ? _changesState$autoass7 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_max_radius) !== null && _ref5 !== void 0 ? _ref5 : '',
173
+ value: (_ref5 = (_changesState$autoass8 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_max_radius) !== null && _changesState$autoass8 !== void 0 ? _changesState$autoass8 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_max_radius) !== null && _ref5 !== void 0 ? _ref5 : '',
167
174
  onChange: function onChange(e) {
168
175
  return handleChangeInput(e);
169
176
  },
@@ -182,7 +189,7 @@ var DriversGroupAutoassignUI = function DriversGroupAutoassignUI(props) {
182
189
  }), /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.GeoAlt, null)))), /*#__PURE__*/_react.default.createElement(_styles2.CheckboxWrapper, {
183
190
  isPadding: true
184
191
  }, /*#__PURE__*/_react.default.createElement(_styles.Checkbox, {
185
- checked: (_changesState$autoass8 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_groupable_individual_orders_only) !== null && _changesState$autoass8 !== void 0 ? _changesState$autoass8 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_groupable_individual_orders_only,
192
+ checked: (_changesState$autoass9 = changesState === null || changesState === void 0 ? void 0 : changesState.autoassign_groupable_individual_orders_only) !== null && _changesState$autoass9 !== void 0 ? _changesState$autoass9 : curDriversGroup === null || curDriversGroup === void 0 ? void 0 : curDriversGroup.autoassign_groupable_individual_orders_only,
186
193
  onChange: function onChange(e) {
187
194
  return onChangeSave({
188
195
  autoassign_groupable_individual_orders_only: e.target.checked
package/_modules/components/Delivery/DriversGroupAutoassign/styles.js CHANGED
@@ -4,9 +4,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.SmallArea = exports.RowGroupContainer = exports.MediumArea = exports.MaxDistanceCustomerContainer = exports.LargeArea = exports.InputsGroup = exports.IconImage = exports.ForcedAssignSettingWrapper = exports.FieldContainer = exports.CustomItem = exports.CheckboxWrapper = exports.AutoassignItem = exports.AutoassignContainer = exports.AreaWrapper = void 0;
7
+ exports.SmallArea = exports.RowGroupContainer = exports.MediumArea = exports.MaxDistanceCustomerContainer = exports.LargeArea = exports.InputsGroup = exports.IconImage = exports.ForcedAssignSettingWrapper = exports.FieldContainer = exports.CustomItem = exports.CheckboxWrapper = exports.CheckboxContainer = exports.AutoassignItem = exports.AutoassignContainer = exports.AreaWrapper = 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, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22, _templateObject23, _templateObject24, _templateObject25, _templateObject26, _templateObject27, _templateObject28, _templateObject29;
9
+ 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;
10
10
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
11
11
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
12
12
  function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
@@ -103,4 +103,6 @@ var SmallArea = _styledComponents.default.div(_templateObject28 || (_templateObj
103
103
  return props.theme.colors.primary;
104
104
  });
105
105
  });
106
- exports.SmallArea = SmallArea;
106
+ exports.SmallArea = SmallArea;
107
+ var CheckboxContainer = _styledComponents.default.div(_templateObject30 || (_templateObject30 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n\n > div {\n &:not(:first-child) {\n margin-top: 5px;\n }\n }\n"])));
108
+ exports.CheckboxContainer = CheckboxContainer;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-admin-external",
3
- "version": "1.31.0",
3
+ "version": "1.31.1",
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.31.0",
86
+ "ordering-components-admin-external": "1.32.0",
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/DriversGroupAutoassign/index.js CHANGED
@@ -19,7 +19,8 @@ import {
19
19
  AreaWrapper,
20
20
  LargeArea,
21
21
  MediumArea,
22
- SmallArea
22
+ SmallArea,
23
+ CheckboxContainer
23
24
  } from './styles'
24
25
 
25
26
  const DriversGroupAutoassignUI = (props) => {
@@ -125,8 +126,8 @@ const DriversGroupAutoassignUI = (props) => {
125
126
  />
126
127
  </FieldContainer>
127
128
  </div>
128
- <div>
129
- {(autoAssign !== 2 && (changesState?.autoassign_amount_drivers < 2 || (typeof changesState?.autoassign_amount_drivers === 'undefined' && curDriversGroup?.autoassign_amount_drivers < 2))) && (
129
+ {(autoAssign !== 2 && (changesState?.autoassign_amount_drivers < 2 || (typeof changesState?.autoassign_amount_drivers === 'undefined' && curDriversGroup?.autoassign_amount_drivers < 2))) && (
130
+ <CheckboxContainer>
130
131
  <CheckboxWrapper>
131
132
  <Checkbox
132
133
  checked={changesState?.autoassign_autoaccept_by_driver ?? curDriversGroup?.autoassign_autoaccept_by_driver}
@@ -134,11 +135,21 @@ const DriversGroupAutoassignUI = (props) => {
134
135
  />
135
136
  <span>{t('ORDER_CONFIRMED_ACCEPTED_BY_DRIVER', 'Accepted by Driver')}</span>
136
137
  </CheckboxWrapper>
137
- )}
138
- </div>
138
+ {(typeof changesState?.autoassign_autoaccept_by_driver === 'undefined' ? !curDriversGroup?.autoassign_autoaccept_by_driver : !changesState?.autoassign_autoaccept_by_driver) && (
139
+ <CheckboxWrapper>
140
+ <Checkbox
141
+ checked={changesState?.autoassign_autoassign_driver ?? curDriversGroup?.autoassign_autoassign_driver}
142
+ onChange={e => onChangeSave({ autoassign_autoassign_driver: e.target.checked })}
143
+ />
144
+ <span>{t('AUTO_ASSIGNED', 'Auto assigned')}</span>
145
+ </CheckboxWrapper>
146
+ )}
147
+ </CheckboxContainer>
148
+ )}
139
149
  </RowGroupContainer>
140
150
 
141
- {(((typeof changesState?.autoassign_autoaccept_by_driver === 'undefined' ? !curDriversGroup?.autoassign_autoaccept_by_driver : !changesState?.autoassign_autoaccept_by_driver)) ||
151
+ {(((typeof changesState?.autoassign_autoaccept_by_driver === 'undefined' ? !curDriversGroup?.autoassign_autoaccept_by_driver : !changesState?.autoassign_autoaccept_by_driver) &&
152
+ (typeof changesState?.autoassign_autoassign_driver === 'undefined' ? !curDriversGroup?.autoassign_autoassign_driver : !changesState?.autoassign_autoassign_driver)) ||
142
153
  (changesState?.type === 1 || (typeof changesState?.type === 'undefined' && curDriversGroup?.type === 1))) && (
143
154
  <FieldContainer>
144
155
  <label>{t('AUTO_REJECT_ORDER_GROUP_AFTER', 'Auto reject Orders After')}</label>
package/src/components/Delivery/DriversGroupAutoassign/styles.js CHANGED
@@ -220,3 +220,13 @@ export const SmallArea = styled.div`
220
220
  border-color: ${props => props.theme.colors.primary};
221
221
  `}
222
222
  `
223
+ export const CheckboxContainer = styled.div`
224
+ display: flex;
225
+ flex-direction: column;
226
+
227
+ > div {
228
+ &:not(:first-child) {
229
+ margin-top: 5px;
230
+ }
231
+ }
232
+ `