ordering-ui-external 14.1.11 → 14.1.12
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/_modules/themes/callcenterOriginal/src/components/AddressForm/index.js +52 -32
- package/_modules/themes/callcenterOriginal/src/components/AddressForm/styles.js +9 -3
- package/_modules/themes/callcenterOriginal/src/components/AddressList/index.js +15 -10
- package/package.json +2 -2
- package/src/themes/callcenterOriginal/src/components/AddressForm/index.js +25 -3
- package/src/themes/callcenterOriginal/src/components/AddressForm/styles.js +18 -0
- package/src/themes/callcenterOriginal/src/components/AddressList/index.js +9 -6
|
@@ -17,6 +17,7 @@ var _GoogleGpsButton = require("../../../../../components/GoogleGpsButton");
|
|
|
17
17
|
var _styles = require("./styles");
|
|
18
18
|
var _Buttons = require("../../styles/Buttons");
|
|
19
19
|
var _Inputs = require("../../styles/Inputs");
|
|
20
|
+
var _styles2 = require("../AddressList/styles");
|
|
20
21
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
21
22
|
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); }
|
|
22
23
|
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; }
|
|
@@ -55,7 +56,8 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
55
56
|
isEnableContinueButton = props.isEnableContinueButton,
|
|
56
57
|
address = props.address,
|
|
57
58
|
notUseCustomerInfo = props.notUseCustomerInfo,
|
|
58
|
-
addFormRestrictions = props.addFormRestrictions
|
|
59
|
+
addFormRestrictions = props.addFormRestrictions,
|
|
60
|
+
isAllowUnaddressOrderType = props.isAllowUnaddressOrderType;
|
|
59
61
|
var _useConfig = (0, _orderingComponentsExternal.useConfig)(),
|
|
60
62
|
_useConfig2 = _slicedToArray(_useConfig, 1),
|
|
61
63
|
configState = _useConfig2[0];
|
|
@@ -72,6 +74,9 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
72
74
|
var _useToast = (0, _orderingComponentsExternal.useToast)(),
|
|
73
75
|
_useToast2 = _slicedToArray(_useToast, 2),
|
|
74
76
|
showToast = _useToast2[1].showToast;
|
|
77
|
+
var _useEvent = (0, _orderingComponentsExternal.useEvent)(),
|
|
78
|
+
_useEvent2 = _slicedToArray(_useEvent, 1),
|
|
79
|
+
events = _useEvent2[0];
|
|
75
80
|
var theme = (0, _styledComponents.useTheme)();
|
|
76
81
|
var _useState = (0, _react.useState)(false),
|
|
77
82
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -355,12 +360,17 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
355
360
|
content: !(errKey === 'ERROR_MAX_LIMIT_LOCATION') ? [t(errKey, mapErrors[errKey])] : "".concat([t(errKey, mapErrors[errKey])], " ").concat(maxLimitLocation, " ").concat([t('METTERS', 'meters')])
|
|
356
361
|
});
|
|
357
362
|
};
|
|
363
|
+
var openStreetView = function openStreetView() {
|
|
364
|
+
var _formState$changes7, _formState$changes8;
|
|
365
|
+
var url = "http://maps.google.com/maps?q=&layer=c&cbll=".concat(formState === null || formState === void 0 || (_formState$changes7 = formState.changes) === null || _formState$changes7 === void 0 || (_formState$changes7 = _formState$changes7.location) === null || _formState$changes7 === void 0 ? void 0 : _formState$changes7.lat, ",").concat(formState === null || formState === void 0 || (_formState$changes8 = formState.changes) === null || _formState$changes8 === void 0 || (_formState$changes8 = _formState$changes8.location) === null || _formState$changes8 === void 0 ? void 0 : _formState$changes8.lng);
|
|
366
|
+
window.open(url, '_blank');
|
|
367
|
+
};
|
|
358
368
|
(0, _react.useEffect)(function () {
|
|
359
|
-
var _formState$result, _ref6, _formState$changes$ad3, _formState$
|
|
369
|
+
var _formState$result, _ref6, _formState$changes$ad3, _formState$changes11, _addressState$address8, _ref7, _formState$changes$ad4, _formState$changes12, _addressState$address9;
|
|
360
370
|
if (!auth) {
|
|
361
|
-
var _ref4, _formState$changes$lo2, _formState$
|
|
362
|
-
setLocationChange((_ref4 = (_formState$changes$lo2 = formState === null || formState === void 0 || (_formState$
|
|
363
|
-
setAddressValue((_ref5 = (_formState$changes$ad2 = formState === null || formState === void 0 || (_formState$
|
|
371
|
+
var _ref4, _formState$changes$lo2, _formState$changes9, _orderState$options, _ref5, _formState$changes$ad2, _formState$changes10, _orderState$options2;
|
|
372
|
+
setLocationChange((_ref4 = (_formState$changes$lo2 = formState === null || formState === void 0 || (_formState$changes9 = formState.changes) === null || _formState$changes9 === void 0 ? void 0 : _formState$changes9.location) !== null && _formState$changes$lo2 !== void 0 ? _formState$changes$lo2 : orderState === null || orderState === void 0 || (_orderState$options = orderState.options) === null || _orderState$options === void 0 || (_orderState$options = _orderState$options.address) === null || _orderState$options === void 0 ? void 0 : _orderState$options.location) !== null && _ref4 !== void 0 ? _ref4 : '');
|
|
373
|
+
setAddressValue((_ref5 = (_formState$changes$ad2 = formState === null || formState === void 0 || (_formState$changes10 = formState.changes) === null || _formState$changes10 === void 0 ? void 0 : _formState$changes10.address) !== null && _formState$changes$ad2 !== void 0 ? _formState$changes$ad2 : orderState === null || orderState === void 0 || (_orderState$options2 = orderState.options) === null || _orderState$options2 === void 0 || (_orderState$options2 = _orderState$options2.address) === null || _orderState$options2 === void 0 ? void 0 : _orderState$options2.address) !== null && _ref5 !== void 0 ? _ref5 : '');
|
|
364
374
|
inputNames.forEach(function (field) {
|
|
365
375
|
var _orderState$options3, _orderState$options4;
|
|
366
376
|
return formMethods.setValue(field.name, (formState === null || formState === void 0 ? void 0 : formState.changes[field.name]) || (orderState === null || orderState === void 0 || (_orderState$options3 = orderState.options) === null || _orderState$options3 === void 0 ? void 0 : _orderState$options3.address) && (orderState === null || orderState === void 0 || (_orderState$options4 = orderState.options) === null || _orderState$options4 === void 0 ? void 0 : _orderState$options4.address[field.name]) || '');
|
|
@@ -374,37 +384,37 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
374
384
|
content: ((_formState$result2 = formState.result) === null || _formState$result2 === void 0 ? void 0 : _formState$result2.result) || [t('ERROR', 'Error')]
|
|
375
385
|
});
|
|
376
386
|
}
|
|
377
|
-
setAddressValue((_ref6 = (_formState$changes$ad3 = formState === null || formState === void 0 || (_formState$
|
|
378
|
-
formMethods.setValue('address', (_ref7 = (_formState$changes$ad4 = formState === null || formState === void 0 || (_formState$
|
|
387
|
+
setAddressValue((_ref6 = (_formState$changes$ad3 = formState === null || formState === void 0 || (_formState$changes11 = formState.changes) === null || _formState$changes11 === void 0 ? void 0 : _formState$changes11.address) !== null && _formState$changes$ad3 !== void 0 ? _formState$changes$ad3 : (_addressState$address8 = addressState.address) === null || _addressState$address8 === void 0 ? void 0 : _addressState$address8.address) !== null && _ref6 !== void 0 ? _ref6 : '');
|
|
388
|
+
formMethods.setValue('address', (_ref7 = (_formState$changes$ad4 = formState === null || formState === void 0 || (_formState$changes12 = formState.changes) === null || _formState$changes12 === void 0 ? void 0 : _formState$changes12.address) !== null && _formState$changes$ad4 !== void 0 ? _formState$changes$ad4 : (_addressState$address9 = addressState.address) === null || _addressState$address9 === void 0 ? void 0 : _addressState$address9.address) !== null && _ref7 !== void 0 ? _ref7 : '');
|
|
379
389
|
if (!isEditing) {
|
|
380
|
-
var _formState$
|
|
390
|
+
var _formState$changes13, _formState$changes14, _formState$changes15, _formState$changes16, _formState$changes17, _formState$changes18, _firstLocationNoEdit$, _formState$changes19, _firstLocationNoEdit$2;
|
|
381
391
|
inputNames.forEach(function (field) {
|
|
382
392
|
return formMethods.setValue(field.name, (formState === null || formState === void 0 ? void 0 : formState.changes[field.name]) || '');
|
|
383
393
|
});
|
|
384
|
-
(formState === null || formState === void 0 || (_formState$
|
|
385
|
-
if (formState !== null && formState !== void 0 && (_formState$
|
|
386
|
-
var _formState$
|
|
394
|
+
(formState === null || formState === void 0 || (_formState$changes13 = formState.changes) === null || _formState$changes13 === void 0 ? void 0 : _formState$changes13.address) && setLocationChange(formState === null || formState === void 0 || (_formState$changes14 = formState.changes) === null || _formState$changes14 === void 0 ? void 0 : _formState$changes14.location);
|
|
395
|
+
if (formState !== null && formState !== void 0 && (_formState$changes15 = formState.changes) !== null && _formState$changes15 !== void 0 && _formState$changes15.address && (formState === null || formState === void 0 || (_formState$changes16 = formState.changes) === null || _formState$changes16 === void 0 ? void 0 : _formState$changes16.address) !== (firstLocationNoEdit === null || firstLocationNoEdit === void 0 ? void 0 : firstLocationNoEdit.address) && formState !== null && formState !== void 0 && (_formState$changes17 = formState.changes) !== null && _formState$changes17 !== void 0 && _formState$changes17.location && (formState === null || formState === void 0 || (_formState$changes18 = formState.changes) === null || _formState$changes18 === void 0 || (_formState$changes18 = _formState$changes18.location) === null || _formState$changes18 === void 0 ? void 0 : _formState$changes18.lat) !== ((_firstLocationNoEdit$ = firstLocationNoEdit.value) === null || _firstLocationNoEdit$ === void 0 ? void 0 : _firstLocationNoEdit$.lat) && (formState === null || formState === void 0 || (_formState$changes19 = formState.changes) === null || _formState$changes19 === void 0 || (_formState$changes19 = _formState$changes19.location) === null || _formState$changes19 === void 0 ? void 0 : _formState$changes19.lng) !== ((_firstLocationNoEdit$2 = firstLocationNoEdit.value) === null || _firstLocationNoEdit$2 === void 0 ? void 0 : _firstLocationNoEdit$2.lng)) {
|
|
396
|
+
var _formState$changes20, _formState$changes21;
|
|
387
397
|
setFirstLocationNoEdit({
|
|
388
|
-
value: formState === null || formState === void 0 || (_formState$
|
|
389
|
-
address: formState === null || formState === void 0 || (_formState$
|
|
398
|
+
value: formState === null || formState === void 0 || (_formState$changes20 = formState.changes) === null || _formState$changes20 === void 0 ? void 0 : _formState$changes20.location,
|
|
399
|
+
address: formState === null || formState === void 0 || (_formState$changes21 = formState.changes) === null || _formState$changes21 === void 0 ? void 0 : _formState$changes21.address
|
|
390
400
|
});
|
|
391
401
|
}
|
|
392
402
|
}
|
|
393
403
|
if (isEditing) {
|
|
394
|
-
var _formState$
|
|
395
|
-
if (formState !== null && formState !== void 0 && (_formState$
|
|
396
|
-
var _formState$
|
|
404
|
+
var _formState$changes22;
|
|
405
|
+
if (formState !== null && formState !== void 0 && (_formState$changes22 = formState.changes) !== null && _formState$changes22 !== void 0 && _formState$changes22.location) {
|
|
406
|
+
var _formState$changes23, _formState$changes24;
|
|
397
407
|
var prevLocation = {
|
|
398
408
|
lat: Math.trunc(locationChange === null || locationChange === void 0 ? void 0 : locationChange.lat),
|
|
399
409
|
lng: Math.trunc(locationChange === null || locationChange === void 0 ? void 0 : locationChange.lng)
|
|
400
410
|
};
|
|
401
411
|
var newLocation = {
|
|
402
|
-
lat: Math.trunc(formState === null || formState === void 0 || (_formState$
|
|
403
|
-
lng: Math.trunc(formState === null || formState === void 0 || (_formState$
|
|
412
|
+
lat: Math.trunc(formState === null || formState === void 0 || (_formState$changes23 = formState.changes) === null || _formState$changes23 === void 0 || (_formState$changes23 = _formState$changes23.location) === null || _formState$changes23 === void 0 ? void 0 : _formState$changes23.lat),
|
|
413
|
+
lng: Math.trunc(formState === null || formState === void 0 || (_formState$changes24 = formState.changes) === null || _formState$changes24 === void 0 || (_formState$changes24 = _formState$changes24.location) === null || _formState$changes24 === void 0 ? void 0 : _formState$changes24.lng)
|
|
404
414
|
};
|
|
405
415
|
if (prevLocation.lat !== newLocation.lat && prevLocation.lng !== newLocation.lng) {
|
|
406
|
-
var _formState$
|
|
407
|
-
setLocationChange(formState === null || formState === void 0 || (_formState$
|
|
416
|
+
var _formState$changes25;
|
|
417
|
+
setLocationChange(formState === null || formState === void 0 || (_formState$changes25 = formState.changes) === null || _formState$changes25 === void 0 ? void 0 : _formState$changes25.location);
|
|
408
418
|
}
|
|
409
419
|
}
|
|
410
420
|
}
|
|
@@ -420,8 +430,8 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
420
430
|
}, [addressState]);
|
|
421
431
|
(0, _react.useEffect)(function () {
|
|
422
432
|
if (!auth) {
|
|
423
|
-
var _ref8, _formState$changes$lo3, _formState$
|
|
424
|
-
setLocationChange((_ref8 = (_formState$changes$lo3 = formState === null || formState === void 0 || (_formState$
|
|
433
|
+
var _ref8, _formState$changes$lo3, _formState$changes26, _orderState$options5;
|
|
434
|
+
setLocationChange((_ref8 = (_formState$changes$lo3 = formState === null || formState === void 0 || (_formState$changes26 = formState.changes) === null || _formState$changes26 === void 0 ? void 0 : _formState$changes26.location) !== null && _formState$changes$lo3 !== void 0 ? _formState$changes$lo3 : orderState === null || orderState === void 0 || (_orderState$options5 = orderState.options) === null || _orderState$options5 === void 0 || (_orderState$options5 = _orderState$options5.address) === null || _orderState$options5 === void 0 ? void 0 : _orderState$options5.location) !== null && _ref8 !== void 0 ? _ref8 : '');
|
|
425
435
|
}
|
|
426
436
|
return function () {
|
|
427
437
|
setFirstLocationNoEdit({
|
|
@@ -444,11 +454,11 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
444
454
|
}, [formMethods.errors]);
|
|
445
455
|
(0, _react.useEffect)(function () {
|
|
446
456
|
inputNames.forEach(function (field) {
|
|
447
|
-
var _ref9, _formState$changes$fi, _formState$
|
|
457
|
+
var _ref9, _formState$changes$fi, _formState$changes27, _addressState$address11;
|
|
448
458
|
formMethods.register(field.name, {
|
|
449
459
|
required: isRequiredField(field.name) ? t("VALIDATION_ERROR_".concat(field.name, "_REQUIRED"), "The field ".concat(field.code, " is required")) : null
|
|
450
460
|
});
|
|
451
|
-
formMethods.setValue(field.name, (_ref9 = (_formState$changes$fi = (_formState$
|
|
461
|
+
formMethods.setValue(field.name, (_ref9 = (_formState$changes$fi = (_formState$changes27 = formState.changes) === null || _formState$changes27 === void 0 ? void 0 : _formState$changes27[field.name]) !== null && _formState$changes$fi !== void 0 ? _formState$changes$fi : (_addressState$address11 = addressState.address) === null || _addressState$address11 === void 0 ? void 0 : _addressState$address11[field.name]) !== null && _ref9 !== void 0 ? _ref9 : '');
|
|
452
462
|
});
|
|
453
463
|
}, [formMethods]);
|
|
454
464
|
(0, _react.useEffect)(function () {
|
|
@@ -487,7 +497,7 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
487
497
|
key: i
|
|
488
498
|
}, props));
|
|
489
499
|
}), inputNames.map(function (field) {
|
|
490
|
-
var _address$location, _address$location2, _formState$result3, _formState$result4, _formState$changes$ad5, _formState$
|
|
500
|
+
var _address$location, _address$location2, _formState$result3, _formState$result4, _formState$changes$ad5, _formState$changes28, _configState$configs5, _addressState$address12, _formState$changes29, _addressState$address13, _formState$changes30, _addressState$address14, _formState$changes31, _addressState$address15, _formState$changes32, _addressState$address16, _formState$changes33, _addressState$address17, _formState$changes34, _addressState$address18, _formState$changes35, _addressState$address19, _formState$changes36, _addressState$address20, _formState$changes37, _addressState$address21, _formState$changes38, _addressState$address22, _formState$changes39, _businessesList$busin, _theme$images, _formState$changes40, _formState$changes41, _formState$changes42, _ref10, _formState$changes$fi2, _formState$changes43, _addressState$address23, _ref11, _formState$changes$ad6, _formState$changes44;
|
|
491
501
|
return showField && showField(field.name) && (field.name === 'address' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
|
|
492
502
|
key: field.name
|
|
493
503
|
}, /*#__PURE__*/_react.default.createElement(_styles.AddressWrap, {
|
|
@@ -512,7 +522,7 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
512
522
|
childRef: function childRef(ref) {
|
|
513
523
|
googleInputRef.current = ref;
|
|
514
524
|
},
|
|
515
|
-
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 : (_formState$changes$ad5 = formState === null || formState === void 0 || (_formState$
|
|
525
|
+
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 : (_formState$changes$ad5 = formState === null || formState === void 0 || (_formState$changes28 = formState.changes) === null || _formState$changes28 === void 0 ? void 0 : _formState$changes28.address) !== null && _formState$changes$ad5 !== void 0 ? _formState$changes$ad5 : addressValue,
|
|
516
526
|
autoComplete: "new-field",
|
|
517
527
|
countryCode: (configState === null || configState === void 0 || (_configState$configs5 = configState.configs) === null || _configState$configs5 === void 0 || (_configState$configs5 = _configState$configs5.country_autocomplete) === null || _configState$configs5 === void 0 ? void 0 : _configState$configs5.value) || '*'
|
|
518
528
|
})), /*#__PURE__*/_react.default.createElement(_GoogleGpsButton.GoogleGpsButton, {
|
|
@@ -525,7 +535,7 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
525
535
|
onError: setMapErrors,
|
|
526
536
|
IconButton: _reactBootstrapIcons.GeoAlt,
|
|
527
537
|
IconLoadingButton: _CgSearchLoading.default
|
|
528
|
-
})), ((addressState === null || addressState === void 0 || (_addressState$address12 = addressState.address) === null || _addressState$address12 === void 0 ? void 0 : _addressState$address12.location) || (formState === null || formState === void 0 || (_formState$
|
|
538
|
+
})), ((addressState === null || addressState === void 0 || (_addressState$address12 = addressState.address) === null || _addressState$address12 === void 0 ? void 0 : _addressState$address12.location) || (formState === null || formState === void 0 || (_formState$changes29 = formState.changes) === null || _formState$changes29 === void 0 ? void 0 : _formState$changes29.location)) && /*#__PURE__*/_react.default.createElement(_styles.WrapperMap, {
|
|
529
539
|
notUseCustomerInfo: notUseCustomerInfo,
|
|
530
540
|
addFormRestrictions: addFormRestrictions
|
|
531
541
|
}, !showMap && /*#__PURE__*/_react.default.createElement("section", null, /*#__PURE__*/_react.default.createElement(_reactBootstrapIcons.GeoAlt, {
|
|
@@ -533,7 +543,7 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
533
543
|
fontSize: 25,
|
|
534
544
|
marginRight: 5
|
|
535
545
|
}
|
|
536
|
-
}), ((addressState === null || addressState === void 0 || (_addressState$address13 = addressState.address) === null || _addressState$address13 === void 0 ? void 0 : _addressState$address13.address) || (formState === null || formState === void 0 || (_formState$
|
|
546
|
+
}), ((addressState === null || addressState === void 0 || (_addressState$address13 = addressState.address) === null || _addressState$address13 === void 0 ? void 0 : _addressState$address13.address) || (formState === null || formState === void 0 || (_formState$changes30 = formState.changes) === null || _formState$changes30 === void 0 ? void 0 : _formState$changes30.address)) && /*#__PURE__*/_react.default.createElement("span", null, (addressState === null || addressState === void 0 || (_addressState$address14 = addressState.address) === null || _addressState$address14 === void 0 ? void 0 : _addressState$address14.address) || (formState === null || formState === void 0 || (_formState$changes31 = formState.changes) === null || _formState$changes31 === void 0 ? void 0 : _formState$changes31.address), ', '), ((addressState === null || addressState === void 0 || (_addressState$address15 = addressState.address) === null || _addressState$address15 === void 0 ? void 0 : _addressState$address15.country) || (formState === null || formState === void 0 || (_formState$changes32 = formState.changes) === null || _formState$changes32 === void 0 ? void 0 : _formState$changes32.country)) && /*#__PURE__*/_react.default.createElement("span", null, (addressState === null || addressState === void 0 || (_addressState$address16 = addressState.address) === null || _addressState$address16 === void 0 ? void 0 : _addressState$address16.country) || (formState === null || formState === void 0 || (_formState$changes33 = formState.changes) === null || _formState$changes33 === void 0 ? void 0 : _formState$changes33.country), ', '), ((addressState === null || addressState === void 0 || (_addressState$address17 = addressState.address) === null || _addressState$address17 === void 0 ? void 0 : _addressState$address17.address_notes) || (formState === null || formState === void 0 || (_formState$changes34 = formState.changes) === null || _formState$changes34 === void 0 ? void 0 : _formState$changes34.address_notes)) && /*#__PURE__*/_react.default.createElement("span", null, (addressState === null || addressState === void 0 || (_addressState$address18 = addressState.address) === null || _addressState$address18 === void 0 ? void 0 : _addressState$address18.address_notes) || (formState === null || formState === void 0 || (_formState$changes35 = formState.changes) === null || _formState$changes35 === void 0 ? void 0 : _formState$changes35.address_notes), ', '), ((addressState === null || addressState === void 0 || (_addressState$address19 = addressState.address) === null || _addressState$address19 === void 0 ? void 0 : _addressState$address19.internal_number) || (formState === null || formState === void 0 || (_formState$changes36 = formState.changes) === null || _formState$changes36 === void 0 ? void 0 : _formState$changes36.internal_number)) && /*#__PURE__*/_react.default.createElement("span", null, (addressState === null || addressState === void 0 || (_addressState$address20 = addressState.address) === null || _addressState$address20 === void 0 ? void 0 : _addressState$address20.internal_number) || (formState === null || formState === void 0 || (_formState$changes37 = formState.changes) === null || _formState$changes37 === void 0 ? void 0 : _formState$changes37.internal_number), ', '), ((addressState === null || addressState === void 0 || (_addressState$address21 = addressState.address) === null || _addressState$address21 === void 0 ? void 0 : _addressState$address21.zipcode) || (formState === null || formState === void 0 || (_formState$changes38 = formState.changes) === null || _formState$changes38 === void 0 ? void 0 : _formState$changes38.zipcode)) && /*#__PURE__*/_react.default.createElement("span", null, (addressState === null || addressState === void 0 || (_addressState$address22 = addressState.address) === null || _addressState$address22 === void 0 ? void 0 : _addressState$address22.zipcode) || (formState === null || formState === void 0 || (_formState$changes39 = formState.changes) === null || _formState$changes39 === void 0 ? void 0 : _formState$changes39.zipcode), ', '), /*#__PURE__*/_react.default.createElement("a", {
|
|
537
547
|
style: {
|
|
538
548
|
textDecoration: 'underline',
|
|
539
549
|
color: 'blue',
|
|
@@ -557,12 +567,16 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
557
567
|
return business === null || business === void 0 ? void 0 : business.zones;
|
|
558
568
|
}),
|
|
559
569
|
fallbackIcon: (_theme$images = theme.images) === null || _theme$images === void 0 || (_theme$images = _theme$images.dummies) === null || _theme$images === void 0 ? void 0 : _theme$images.businessLogo
|
|
560
|
-
}))) : /*#__PURE__*/_react.default.createElement(
|
|
570
|
+
}), (formState === null || formState === void 0 || (_formState$changes40 = formState.changes) === null || _formState$changes40 === void 0 || (_formState$changes40 = _formState$changes40.location) === null || _formState$changes40 === void 0 ? void 0 : _formState$changes40.lat) && (formState === null || formState === void 0 || (_formState$changes41 = formState.changes) === null || _formState$changes41 === void 0 || (_formState$changes41 = _formState$changes41.location) === null || _formState$changes41 === void 0 ? void 0 : _formState$changes41.lng) && (formState === null || formState === void 0 || (_formState$changes42 = formState.changes) === null || _formState$changes42 === void 0 ? void 0 : _formState$changes42.address) && showMap && /*#__PURE__*/_react.default.createElement(_styles.StreetViewText, {
|
|
571
|
+
onClick: function onClick() {
|
|
572
|
+
return openStreetView();
|
|
573
|
+
}
|
|
574
|
+
}, t('OPEN_STREET_VIEW', 'Open Street view')))) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
|
|
561
575
|
key: field.name
|
|
562
576
|
}, field.name !== 'address_notes' ? /*#__PURE__*/_react.default.createElement(_Inputs.Input, {
|
|
563
577
|
className: field.name,
|
|
564
578
|
placeholder: t(field.name.toUpperCase(), field.code),
|
|
565
|
-
value: (_ref10 = (_formState$changes$fi2 = (_formState$
|
|
579
|
+
value: (_ref10 = (_formState$changes$fi2 = (_formState$changes43 = formState.changes) === null || _formState$changes43 === void 0 ? void 0 : _formState$changes43[field.name]) !== null && _formState$changes$fi2 !== void 0 ? _formState$changes$fi2 : (_addressState$address23 = addressState.address) === null || _addressState$address23 === void 0 ? void 0 : _addressState$address23[field.name]) !== null && _ref10 !== void 0 ? _ref10 : '',
|
|
566
580
|
onChange: function onChange(e) {
|
|
567
581
|
formMethods.setValue(field.name, e.target.value);
|
|
568
582
|
handleChangeInput({
|
|
@@ -577,7 +591,7 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
577
591
|
}) : /*#__PURE__*/_react.default.createElement(_Inputs.TextArea, {
|
|
578
592
|
rows: 4,
|
|
579
593
|
placeholder: t('ADDRESS_NOTES', 'Address Notes'),
|
|
580
|
-
value: (_ref11 = (_formState$changes$ad6 = (_formState$
|
|
594
|
+
value: (_ref11 = (_formState$changes$ad6 = (_formState$changes44 = formState.changes) === null || _formState$changes44 === void 0 ? void 0 : _formState$changes44.address_notes) !== null && _formState$changes$ad6 !== void 0 ? _formState$changes$ad6 : addressState.address.address_notes) !== null && _ref11 !== void 0 ? _ref11 : '',
|
|
581
595
|
onChange: function onChange(e) {
|
|
582
596
|
formMethods.setValue('address_notes', e.target.value);
|
|
583
597
|
handleChangeInput({
|
|
@@ -643,7 +657,13 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
643
657
|
type: "submit",
|
|
644
658
|
disabled: formState.loading,
|
|
645
659
|
color: "primary"
|
|
646
|
-
}, !formState.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isEditing || !auth && (_orderState$options6 = orderState.options) !== null && _orderState$options6 !== void 0 && (_orderState$options6 = _orderState$options6.address) !== null && _orderState$options6 !== void 0 && _orderState$options6.address ? t('UPDATE', 'Update') : t('ADD_ADDRESS', 'Add address')) : t('LOADING', 'Loading')))
|
|
660
|
+
}, !formState.loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isEditing || !auth && (_orderState$options6 = orderState.options) !== null && _orderState$options6 !== void 0 && (_orderState$options6 = _orderState$options6.address) !== null && _orderState$options6 !== void 0 && _orderState$options6.address ? t('UPDATE', 'Update') : t('ADD_ADDRESS', 'Add address')) : t('LOADING', 'Loading'))), isAllowUnaddressOrderType && /*#__PURE__*/_react.default.createElement(_styles.WithoutAddressContainer, null, /*#__PURE__*/_react.default.createElement(_styles2.WithoutAddressText, {
|
|
661
|
+
onClick: function onClick() {
|
|
662
|
+
return events.emit('go_to_page', {
|
|
663
|
+
page: 'search'
|
|
664
|
+
});
|
|
665
|
+
}
|
|
666
|
+
}, t('CONTINUE_WITHOUT_ADDRESS', 'Continue without address')))), /*#__PURE__*/_react.default.createElement(_Confirm.Alert, {
|
|
647
667
|
title: t('ADDRESS', 'Address'),
|
|
648
668
|
content: alertState.content,
|
|
649
669
|
acceptText: t('ACCEPT', 'Accept'),
|
|
@@ -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.WrapperSkeleton = exports.WrapperMap = exports.WrapAddressInput = exports.FormControl = exports.FormActions = exports.AddressWrap = exports.AddressTagSection = exports.AddressMarkContainer = void 0;
|
|
7
|
+
exports.WrapperSkeleton = exports.WrapperMap = exports.WrapAddressInput = exports.WithoutAddressContainer = exports.StreetViewText = exports.FormControl = exports.FormActions = exports.AddressWrap = exports.AddressTagSection = exports.AddressMarkContainer = void 0;
|
|
8
8
|
var _styledComponents = _interopRequireWildcard(require("styled-components"));
|
|
9
9
|
var _polished = require("polished");
|
|
10
|
-
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
|
|
10
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15;
|
|
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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
|
|
@@ -43,4 +43,10 @@ var WrapperMap = exports.WrapperMap = _styledComponents.default.div(_templateObj
|
|
|
43
43
|
return notUseCustomerInfo ? '370px' : '480px';
|
|
44
44
|
});
|
|
45
45
|
var WrapperSkeleton = exports.WrapperSkeleton = _styledComponents.default.div(_templateObject12 || (_templateObject12 = _taggedTemplateLiteral(["\n display: flex;\n flex-direction: column;\n padding: 10px;\n\n span {\n width: 100%;\n }\n"])));
|
|
46
|
-
var AddressMarkContainer = exports.AddressMarkContainer = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n background: #FFE69C;\n border: 1px solid #FFF3CD;\n display: flex;\n padding: 8px;\n justify-content: center;\n align-items: center;\n border-radius: 4px;\n position: absolute;\n top: 50px;\n width: max-content;\n p {\n margin: 0;\n color: #664D03;\n font-size: 12px;\n }\n"])));
|
|
46
|
+
var AddressMarkContainer = exports.AddressMarkContainer = _styledComponents.default.div(_templateObject13 || (_templateObject13 = _taggedTemplateLiteral(["\n background: #FFE69C;\n border: 1px solid #FFF3CD;\n display: flex;\n padding: 8px;\n justify-content: center;\n align-items: center;\n border-radius: 4px;\n position: absolute;\n top: 50px;\n width: max-content;\n p {\n margin: 0;\n color: #664D03;\n font-size: 12px;\n }\n"])));
|
|
47
|
+
var StreetViewText = exports.StreetViewText = _styledComponents.default.span(_templateObject14 || (_templateObject14 = _taggedTemplateLiteral(["\n position: absolute;\n right: 35px;\n top: 30px;\n text-decoration: underline;\n color: ", ";\n z-index: 9999;\n"])), function (_ref2) {
|
|
48
|
+
var _theme$colors;
|
|
49
|
+
var theme = _ref2.theme;
|
|
50
|
+
return theme === null || theme === void 0 || (_theme$colors = theme.colors) === null || _theme$colors === void 0 ? void 0 : _theme$colors.primary;
|
|
51
|
+
});
|
|
52
|
+
var WithoutAddressContainer = exports.WithoutAddressContainer = _styledComponents.default.div(_templateObject15 || (_templateObject15 = _taggedTemplateLiteral(["\n width: 100%;\n display: flex;\n justify-content: center;\n p {\n margin-bottom: 0;\n }\n"])));
|
|
@@ -36,7 +36,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
36
36
|
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; } }
|
|
37
37
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
38
38
|
var AddressListUI = function AddressListUI(props) {
|
|
39
|
-
var _addressList$addresse, _configs$unaddressed_,
|
|
39
|
+
var _addressList$addresse, _configs$unaddressed_, _orderState$options, _props$beforeElements, _props$beforeComponen, _addressList$addresse3, _addressList$addresse4, _orderState$options7, _addressList$error$, _orderState$options8, _orderState$options9, _props$afterComponent, _props$afterElements;
|
|
40
40
|
var actionStatus = props.actionStatus,
|
|
41
41
|
addressList = props.addressList,
|
|
42
42
|
handleDelete = props.handleDelete,
|
|
@@ -98,8 +98,10 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
98
98
|
return address.address === obj.address && address.address_notes === obj.address_notes && address.zipcode === obj.zipcode && address.internal_number === obj.internal_number;
|
|
99
99
|
});
|
|
100
100
|
}) || [];
|
|
101
|
-
var
|
|
102
|
-
|
|
101
|
+
var unaddressedTypes = (configs === null || configs === void 0 || (_configs$unaddressed_ = configs.unaddressed_order_types_allowed) === null || _configs$unaddressed_ === void 0 ? void 0 : _configs$unaddressed_.value.split('|').map(function (value) {
|
|
102
|
+
return Number(value);
|
|
103
|
+
})) || [];
|
|
104
|
+
var isAllowUnaddressOrderType = unaddressedTypes.includes(orderState === null || orderState === void 0 || (_orderState$options = orderState.options) === null || _orderState$options === void 0 ? void 0 : _orderState$options.type);
|
|
103
105
|
var openAddress = function openAddress(address) {
|
|
104
106
|
setCurAddress(address);
|
|
105
107
|
setAddressOpen(true);
|
|
@@ -217,15 +219,15 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
217
219
|
(0, _react.useEffect)(function () {
|
|
218
220
|
var _addressList$addresse2;
|
|
219
221
|
var addressValidation = ((_addressList$addresse2 = addressList.addresses) === null || _addressList$addresse2 === void 0 ? void 0 : _addressList$addresse2.length) === 0 && !(addressList !== null && addressList !== void 0 && addressList.loading) && !(addressList !== null && addressList !== void 0 && addressList.error);
|
|
220
|
-
if (userCustomerSetup !== null && userCustomerSetup !== void 0 && userCustomerSetup.imported_address_text && addressValidation) {
|
|
222
|
+
if (userCustomerSetup !== null && userCustomerSetup !== void 0 && userCustomerSetup.imported_address_text && addressValidation && !isOpenUserData) {
|
|
221
223
|
openAddress({
|
|
222
224
|
address: userCustomerSetup === null || userCustomerSetup === void 0 ? void 0 : userCustomerSetup.imported_address_text
|
|
223
225
|
});
|
|
224
226
|
}
|
|
225
|
-
if (!(userCustomerSetup !== null && userCustomerSetup !== void 0 && userCustomerSetup.imported_address_text) && addressValidation) {
|
|
227
|
+
if (!(userCustomerSetup !== null && userCustomerSetup !== void 0 && userCustomerSetup.imported_address_text) && addressValidation && !isOpenUserData) {
|
|
226
228
|
openAddress({});
|
|
227
229
|
}
|
|
228
|
-
}, [userCustomerSetup === null || userCustomerSetup === void 0 ? void 0 : userCustomerSetup.imported_address_text, addressList.addresses, addressList === null || addressList === void 0 ? void 0 : addressList.loading, addressList === null || addressList === void 0 ? void 0 : addressList.error]);
|
|
230
|
+
}, [userCustomerSetup === null || userCustomerSetup === void 0 ? void 0 : userCustomerSetup.imported_address_text, addressList.addresses, addressList === null || addressList === void 0 ? void 0 : addressList.loading, addressList === null || addressList === void 0 ? void 0 : addressList.error, isOpenUserData]);
|
|
229
231
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (_props$beforeElements = props.beforeElements) === null || _props$beforeElements === void 0 ? void 0 : _props$beforeElements.map(function (BeforeElement, i) {
|
|
230
232
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
|
|
231
233
|
key: i
|
|
@@ -261,14 +263,15 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
261
263
|
return handleCloseAddressForm();
|
|
262
264
|
},
|
|
263
265
|
onSaveAddress: handleSaveAddress,
|
|
264
|
-
userCustomerSetup: userCustomerSetup
|
|
266
|
+
userCustomerSetup: userCustomerSetup,
|
|
267
|
+
isAllowUnaddressOrderType: isAllowUnaddressOrderType
|
|
265
268
|
}), !addressList.loading && !actionStatus.loading && !orderState.loading && !addressList.error && (addressList === null || addressList === void 0 || (_addressList$addresse4 = addressList.addresses) === null || _addressList$addresse4 === void 0 ? void 0 : _addressList$addresse4.length) > 0 && _typeof((_orderState$options7 = orderState.options) === null || _orderState$options7 === void 0 ? void 0 : _orderState$options7.address) === 'object' && !addressOpen && (!addressOpen && isPopover || isModal) && /*#__PURE__*/_react.default.createElement(_styles.AddressListUl, {
|
|
266
269
|
id: "list"
|
|
267
270
|
}, /*#__PURE__*/_react.default.createElement(_styles.AddressTitleContainer, {
|
|
268
271
|
style: {
|
|
269
272
|
display: 'flex'
|
|
270
273
|
}
|
|
271
|
-
}, /*#__PURE__*/_react.default.createElement(_styles.AddressTitle, null, t('SELECT_ONE_OF_SAVED_PLACES', 'Select one of your saved places')),
|
|
274
|
+
}, /*#__PURE__*/_react.default.createElement(_styles.AddressTitle, null, t('SELECT_ONE_OF_SAVED_PLACES', 'Select one of your saved places')), isAllowUnaddressOrderType && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", null, ' ', t('OR', 'or'), ' '), /*#__PURE__*/_react.default.createElement(_styles.WithoutAddressText, {
|
|
272
275
|
onClick: function onClick() {
|
|
273
276
|
return events.emit('go_to_page', {
|
|
274
277
|
page: 'search'
|
|
@@ -335,7 +338,8 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
335
338
|
userCustomerSetup: userCustomerSetup,
|
|
336
339
|
notUseCustomerInfo: notUseCustomerInfo,
|
|
337
340
|
franchiseId: franchiseId,
|
|
338
|
-
addFormRestrictions: addFormRestrictions
|
|
341
|
+
addFormRestrictions: addFormRestrictions,
|
|
342
|
+
isAllowUnaddressOrderType: isAllowUnaddressOrderType
|
|
339
343
|
}))), addressOpen && !notUseCustomerInfo && /*#__PURE__*/_react.default.createElement(_styles.AddressFormContainer, {
|
|
340
344
|
width: "50%",
|
|
341
345
|
addFormRestrictions: addFormRestrictions
|
|
@@ -379,7 +383,8 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
379
383
|
return handleCloseAddressForm();
|
|
380
384
|
},
|
|
381
385
|
onSaveAddress: handleSaveAddress,
|
|
382
|
-
userCustomerSetup: userCustomerSetup
|
|
386
|
+
userCustomerSetup: userCustomerSetup,
|
|
387
|
+
isAllowUnaddressOrderType: isAllowUnaddressOrderType
|
|
383
388
|
})), /*#__PURE__*/_react.default.createElement(_Confirm.Confirm, {
|
|
384
389
|
title: t('SEARCH', 'Search'),
|
|
385
390
|
content: confirm.content,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-external",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.1.12",
|
|
4
4
|
"description": "Ordering UI Components",
|
|
5
5
|
"main": "./_modules/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"lodash": "^4.17.19",
|
|
89
89
|
"moment": "^2.29.4",
|
|
90
90
|
"nanoid": "^4.0.0",
|
|
91
|
-
"ordering-components-external": "13.0.
|
|
91
|
+
"ordering-components-external": "13.0.24",
|
|
92
92
|
"payment": "^2.4.6",
|
|
93
93
|
"polished": "^3.6.6",
|
|
94
94
|
"react-bootstrap-icons": "^1.7.2",
|
|
@@ -18,8 +18,9 @@ import {
|
|
|
18
18
|
useSession,
|
|
19
19
|
useOrder,
|
|
20
20
|
useConfig,
|
|
21
|
+
useToast,
|
|
21
22
|
ToastType,
|
|
22
|
-
|
|
23
|
+
useEvent
|
|
23
24
|
} from 'ordering-components-external'
|
|
24
25
|
import { Alert } from '../Confirm'
|
|
25
26
|
import { GoogleGpsButton } from '../../../../../components/GoogleGpsButton'
|
|
@@ -31,11 +32,14 @@ import {
|
|
|
31
32
|
AddressTagSection,
|
|
32
33
|
WrapperMap,
|
|
33
34
|
WrapperSkeleton,
|
|
34
|
-
AddressMarkContainer
|
|
35
|
+
AddressMarkContainer,
|
|
36
|
+
StreetViewText,
|
|
37
|
+
WithoutAddressContainer
|
|
35
38
|
} from './styles'
|
|
36
39
|
|
|
37
40
|
import { Button } from '../../styles/Buttons'
|
|
38
41
|
import { Input, TextArea } from '../../styles/Inputs'
|
|
42
|
+
import { WithoutAddressText } from '../AddressList/styles'
|
|
39
43
|
|
|
40
44
|
const AddressFormUI = (props) => {
|
|
41
45
|
const {
|
|
@@ -56,7 +60,8 @@ const AddressFormUI = (props) => {
|
|
|
56
60
|
isEnableContinueButton,
|
|
57
61
|
address,
|
|
58
62
|
notUseCustomerInfo,
|
|
59
|
-
addFormRestrictions
|
|
63
|
+
addFormRestrictions,
|
|
64
|
+
isAllowUnaddressOrderType
|
|
60
65
|
} = props
|
|
61
66
|
|
|
62
67
|
const [configState] = useConfig()
|
|
@@ -65,6 +70,7 @@ const AddressFormUI = (props) => {
|
|
|
65
70
|
const formMethods = useForm()
|
|
66
71
|
const [{ auth }] = useSession()
|
|
67
72
|
const [, { showToast }] = useToast()
|
|
73
|
+
const [events] = useEvent()
|
|
68
74
|
const theme = useTheme()
|
|
69
75
|
|
|
70
76
|
const [selectedFromAutocomplete, setSelectedFromAutocomplete] = useState(false)
|
|
@@ -266,6 +272,11 @@ const AddressFormUI = (props) => {
|
|
|
266
272
|
})
|
|
267
273
|
}
|
|
268
274
|
|
|
275
|
+
const openStreetView = () => {
|
|
276
|
+
const url = `http://maps.google.com/maps?q=&layer=c&cbll=${formState?.changes?.location?.lat},${formState?.changes?.location?.lng}`
|
|
277
|
+
window.open(url, '_blank')
|
|
278
|
+
}
|
|
279
|
+
|
|
269
280
|
useEffect(() => {
|
|
270
281
|
if (!auth) {
|
|
271
282
|
setLocationChange(formState?.changes?.location ?? orderState?.options?.address?.location ?? '')
|
|
@@ -447,6 +458,7 @@ const AddressFormUI = (props) => {
|
|
|
447
458
|
|
|
448
459
|
{(addressState?.address?.location || formState?.changes?.location) && (
|
|
449
460
|
<WrapperMap notUseCustomerInfo={notUseCustomerInfo} addFormRestrictions={addFormRestrictions}>
|
|
461
|
+
|
|
450
462
|
{!showMap && (
|
|
451
463
|
<section>
|
|
452
464
|
<GeoAlt style={{ fontSize: 25, marginRight: 5 }} />
|
|
@@ -489,6 +501,11 @@ const AddressFormUI = (props) => {
|
|
|
489
501
|
fallbackIcon={theme.images?.dummies?.businessLogo}
|
|
490
502
|
/>
|
|
491
503
|
)}
|
|
504
|
+
{formState?.changes?.location?.lat && formState?.changes?.location?.lng && formState?.changes?.address && showMap && (
|
|
505
|
+
<StreetViewText onClick={() => openStreetView()}>
|
|
506
|
+
{t('OPEN_STREET_VIEW', 'Open Street view')}
|
|
507
|
+
</StreetViewText>
|
|
508
|
+
)}
|
|
492
509
|
</WrapperMap>
|
|
493
510
|
)}
|
|
494
511
|
</React.Fragment>
|
|
@@ -585,6 +602,11 @@ const AddressFormUI = (props) => {
|
|
|
585
602
|
</Button>
|
|
586
603
|
)}
|
|
587
604
|
</FormActions>
|
|
605
|
+
{isAllowUnaddressOrderType && (
|
|
606
|
+
<WithoutAddressContainer>
|
|
607
|
+
<WithoutAddressText onClick={() => events.emit('go_to_page', { page: 'search' })}>{t('CONTINUE_WITHOUT_ADDRESS', 'Continue without address')}</WithoutAddressText>
|
|
608
|
+
</WithoutAddressContainer>
|
|
609
|
+
)}
|
|
588
610
|
</FormControl>
|
|
589
611
|
)}
|
|
590
612
|
|
|
@@ -246,3 +246,21 @@ export const AddressMarkContainer = styled.div`
|
|
|
246
246
|
font-size: 12px;
|
|
247
247
|
}
|
|
248
248
|
`
|
|
249
|
+
|
|
250
|
+
export const StreetViewText = styled.span`
|
|
251
|
+
position: absolute;
|
|
252
|
+
right: 35px;
|
|
253
|
+
top: 30px;
|
|
254
|
+
text-decoration: underline;
|
|
255
|
+
color: ${({ theme }) => theme?.colors?.primary};
|
|
256
|
+
z-index: 9999;
|
|
257
|
+
`
|
|
258
|
+
|
|
259
|
+
export const WithoutAddressContainer = styled.div`
|
|
260
|
+
width: 100%;
|
|
261
|
+
display: flex;
|
|
262
|
+
justify-content: center;
|
|
263
|
+
p {
|
|
264
|
+
margin-bottom: 0;
|
|
265
|
+
}
|
|
266
|
+
`
|
|
@@ -97,8 +97,8 @@ const AddressListUI = (props) => {
|
|
|
97
97
|
address.zipcode === obj.zipcode &&
|
|
98
98
|
address.internal_number === obj.internal_number
|
|
99
99
|
)))) || []
|
|
100
|
-
const
|
|
101
|
-
const
|
|
100
|
+
const unaddressedTypes = configs?.unaddressed_order_types_allowed?.value.split('|').map(value => Number(value)) || []
|
|
101
|
+
const isAllowUnaddressOrderType = unaddressedTypes.includes(orderState?.options?.type)
|
|
102
102
|
const openAddress = (address) => {
|
|
103
103
|
setCurAddress(address)
|
|
104
104
|
setAddressOpen(true)
|
|
@@ -216,15 +216,15 @@ const AddressListUI = (props) => {
|
|
|
216
216
|
|
|
217
217
|
useEffect(() => {
|
|
218
218
|
const addressValidation = addressList.addresses?.length === 0 && !addressList?.loading && !addressList?.error
|
|
219
|
-
if (userCustomerSetup?.imported_address_text && addressValidation) {
|
|
219
|
+
if (userCustomerSetup?.imported_address_text && addressValidation && !isOpenUserData) {
|
|
220
220
|
openAddress({
|
|
221
221
|
address: userCustomerSetup?.imported_address_text
|
|
222
222
|
})
|
|
223
223
|
}
|
|
224
|
-
if (!userCustomerSetup?.imported_address_text && addressValidation) {
|
|
224
|
+
if (!userCustomerSetup?.imported_address_text && addressValidation && !isOpenUserData) {
|
|
225
225
|
openAddress({})
|
|
226
226
|
}
|
|
227
|
-
}, [userCustomerSetup?.imported_address_text, addressList.addresses, addressList?.loading, addressList?.error])
|
|
227
|
+
}, [userCustomerSetup?.imported_address_text, addressList.addresses, addressList?.loading, addressList?.error, isOpenUserData])
|
|
228
228
|
|
|
229
229
|
return (
|
|
230
230
|
<>
|
|
@@ -267,6 +267,7 @@ const AddressListUI = (props) => {
|
|
|
267
267
|
onCancel={() => handleCloseAddressForm()}
|
|
268
268
|
onSaveAddress={handleSaveAddress}
|
|
269
269
|
userCustomerSetup={userCustomerSetup}
|
|
270
|
+
isAllowUnaddressOrderType={isAllowUnaddressOrderType}
|
|
270
271
|
/>
|
|
271
272
|
)
|
|
272
273
|
}
|
|
@@ -283,7 +284,7 @@ const AddressListUI = (props) => {
|
|
|
283
284
|
<AddressListUl id='list'>
|
|
284
285
|
<AddressTitleContainer style={{ display: 'flex' }}>
|
|
285
286
|
<AddressTitle>{t('SELECT_ONE_OF_SAVED_PLACES', 'Select one of your saved places')}</AddressTitle>
|
|
286
|
-
{
|
|
287
|
+
{isAllowUnaddressOrderType && (
|
|
287
288
|
<>
|
|
288
289
|
<p>{' '}{t('OR', 'or')}{' '}</p>
|
|
289
290
|
<WithoutAddressText onClick={() => events.emit('go_to_page', { page: 'search' })}>{t('CONTINUE_WITHOUT_ADDRESS', 'Continue without address')}</WithoutAddressText>
|
|
@@ -367,6 +368,7 @@ const AddressListUI = (props) => {
|
|
|
367
368
|
notUseCustomerInfo={notUseCustomerInfo}
|
|
368
369
|
franchiseId={franchiseId}
|
|
369
370
|
addFormRestrictions={addFormRestrictions}
|
|
371
|
+
isAllowUnaddressOrderType={isAllowUnaddressOrderType}
|
|
370
372
|
/>
|
|
371
373
|
</AddressFormContainer>
|
|
372
374
|
)}
|
|
@@ -431,6 +433,7 @@ const AddressListUI = (props) => {
|
|
|
431
433
|
onCancel={() => handleCloseAddressForm()}
|
|
432
434
|
onSaveAddress={handleSaveAddress}
|
|
433
435
|
userCustomerSetup={userCustomerSetup}
|
|
436
|
+
isAllowUnaddressOrderType={isAllowUnaddressOrderType}
|
|
434
437
|
/>
|
|
435
438
|
</Modal>
|
|
436
439
|
)
|