ordering-ui-external 14.1.41 → 14.1.43
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/_bundles/{7.ordering-ui.2a09e7e0162e34ea955c.js → 7.ordering-ui.8affcf551a37ff54e392.js} +1 -1
- package/_bundles/{ordering-ui.2a09e7e0162e34ea955c.js → ordering-ui.8affcf551a37ff54e392.js} +2 -2
- package/_modules/themes/callcenterOriginal/src/components/AddressForm/SpreadForm/index.js +4 -2
- package/_modules/themes/callcenterOriginal/src/components/AddressForm/index.js +11 -1
- package/_modules/themes/callcenterOriginal/src/components/AddressList/index.js +24 -18
- package/_modules/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js +1 -1
- package/_modules/themes/five/src/components/Cart/index.js +5 -2
- package/_modules/themes/five/src/components/OrderDetails/OrderBillSection.js +5 -2
- package/package.json +2 -2
- package/src/themes/callcenterOriginal/src/components/AddressForm/SpreadForm/index.js +2 -2
- package/src/themes/callcenterOriginal/src/components/AddressForm/index.js +11 -1
- package/src/themes/callcenterOriginal/src/components/AddressList/index.js +20 -13
- package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js +1 -2
- package/src/themes/five/src/components/Cart/index.js +2 -1
- package/src/themes/five/src/components/OrderDetails/OrderBillSection.js +2 -2
- /package/_bundles/{0.ordering-ui.2a09e7e0162e34ea955c.js → 0.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{1.ordering-ui.2a09e7e0162e34ea955c.js → 1.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{2.ordering-ui.2a09e7e0162e34ea955c.js → 2.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{4.ordering-ui.2a09e7e0162e34ea955c.js → 4.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{5.ordering-ui.2a09e7e0162e34ea955c.js → 5.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{6.ordering-ui.2a09e7e0162e34ea955c.js → 6.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{7.ordering-ui.2a09e7e0162e34ea955c.js.LICENSE.txt → 7.ordering-ui.8affcf551a37ff54e392.js.LICENSE.txt} +0 -0
- /package/_bundles/{8.ordering-ui.2a09e7e0162e34ea955c.js → 8.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{9.ordering-ui.2a09e7e0162e34ea955c.js → 9.ordering-ui.8affcf551a37ff54e392.js} +0 -0
- /package/_bundles/{ordering-ui.2a09e7e0162e34ea955c.js.LICENSE.txt → ordering-ui.8affcf551a37ff54e392.js.LICENSE.txt} +0 -0
|
@@ -99,14 +99,16 @@ var SpreadForm = exports.SpreadForm = function SpreadForm(props) {
|
|
|
99
99
|
changes: {},
|
|
100
100
|
loading: false,
|
|
101
101
|
error: null,
|
|
102
|
-
added:
|
|
102
|
+
added: !!(address !== null && address !== void 0 && address.location)
|
|
103
103
|
}),
|
|
104
104
|
_useState2 = _slicedToArray(_useState, 2),
|
|
105
105
|
formState = _useState2[0],
|
|
106
106
|
setFormState = _useState2[1];
|
|
107
107
|
var googleMapsApiKey = configs === null || configs === void 0 || (_configs$google_maps_ = configs.google_maps_api_key) === null || _configs$google_maps_ === void 0 ? void 0 : _configs$google_maps_.value;
|
|
108
108
|
var handleAddAddress = function handleAddAddress() {
|
|
109
|
-
onChangeAddress(formState.changes)
|
|
109
|
+
onChangeAddress(_objectSpread(_objectSpread({}, formState.changes), {}, {
|
|
110
|
+
verified: !!(formState !== null && formState !== void 0 && formState.previousResponseId)
|
|
111
|
+
}));
|
|
110
112
|
setFormState(_objectSpread(_objectSpread({}, formState), {}, {
|
|
111
113
|
added: true
|
|
112
114
|
}));
|
|
@@ -481,7 +481,17 @@ var AddressFormUI = function AddressFormUI(props) {
|
|
|
481
481
|
}, [address]);
|
|
482
482
|
(0, _react.useEffect)(function () {
|
|
483
483
|
if (addressSpreadForm) {
|
|
484
|
-
|
|
484
|
+
if (!isEditing) {
|
|
485
|
+
handleChangeAddress(addressSpreadForm, true);
|
|
486
|
+
} else {
|
|
487
|
+
setLocationChange(addressSpreadForm === null || addressSpreadForm === void 0 ? void 0 : addressSpreadForm.location);
|
|
488
|
+
if (addressSpreadForm !== null && addressSpreadForm !== void 0 && addressSpreadForm.verified) {
|
|
489
|
+
var values = addressSpreadForm;
|
|
490
|
+
delete values.verified;
|
|
491
|
+
setSelectedFromAutocomplete(true);
|
|
492
|
+
updateChanges(values);
|
|
493
|
+
}
|
|
494
|
+
}
|
|
485
495
|
}
|
|
486
496
|
}, [addressSpreadForm]);
|
|
487
497
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -24,17 +24,33 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
24
24
|
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); }
|
|
25
25
|
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; }
|
|
26
26
|
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
27
|
-
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
28
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
29
|
-
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
30
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
31
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
32
27
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
33
28
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
34
29
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
35
30
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
36
31
|
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
32
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
33
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
34
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
35
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
36
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
37
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
38
|
+
var getSpreadAddressFormatted = function getSpreadAddressFormatted(_address) {
|
|
39
|
+
var restValues = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
40
|
+
return _objectSpread({
|
|
41
|
+
route: _address === null || _address === void 0 ? void 0 : _address.route,
|
|
42
|
+
street_number: _address === null || _address === void 0 ? void 0 : _address.street_number,
|
|
43
|
+
neighborhood: _address === null || _address === void 0 ? void 0 : _address.neighborhood,
|
|
44
|
+
city: _address === null || _address === void 0 ? void 0 : _address.city,
|
|
45
|
+
state: _address === null || _address === void 0 ? void 0 : _address.state,
|
|
46
|
+
country_code: _address === null || _address === void 0 ? void 0 : _address.country_code,
|
|
47
|
+
country: _address === null || _address === void 0 ? void 0 : _address.country,
|
|
48
|
+
address: _address === null || _address === void 0 ? void 0 : _address.address,
|
|
49
|
+
locality: _address === null || _address === void 0 ? void 0 : _address.locality,
|
|
50
|
+
location: _address === null || _address === void 0 ? void 0 : _address.location,
|
|
51
|
+
zipcode: _address === null || _address === void 0 ? void 0 : _address.zipcode
|
|
52
|
+
}, restValues);
|
|
53
|
+
};
|
|
38
54
|
var AddressListUI = function AddressListUI(props) {
|
|
39
55
|
var _addressList$addresse, _configs$unaddressed_, _orderState$options, _orderState$options2, _configs$country_auto, _configs$country_auto2, _configs$addresses_fo, _addressList$addresse3, _addressList$addresse4, _orderState$options8, _orderState$options9, _addressList$error$, _orderState$options10, _orderState$options11, _orderState$options12;
|
|
40
56
|
var actionStatus = props.actionStatus,
|
|
@@ -114,6 +130,7 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
114
130
|
var showSpreadForm = (configs === null || configs === void 0 || (_configs$addresses_fo = configs.addresses_form_type) === null || _configs$addresses_fo === void 0 ? void 0 : _configs$addresses_fo.value) === 'country';
|
|
115
131
|
var openAddress = function openAddress(address) {
|
|
116
132
|
setCurAddress(address);
|
|
133
|
+
(address === null || address === void 0 ? void 0 : address.location) && setAddressSpreadForm(getSpreadAddressFormatted(address));
|
|
117
134
|
setAddressOpen(true);
|
|
118
135
|
setIsAddressFormOpen && setIsAddressFormOpen(true);
|
|
119
136
|
var container = window.document.getElementsByClassName('form_edit')[0];
|
|
@@ -208,6 +225,7 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
208
225
|
var handleCloseAddressForm = function handleCloseAddressForm() {
|
|
209
226
|
setAddressOpen(false);
|
|
210
227
|
setIsAddressFormOpen && setIsAddressFormOpen(false);
|
|
228
|
+
setEditSpreadAddress(false);
|
|
211
229
|
};
|
|
212
230
|
|
|
213
231
|
/**
|
|
@@ -360,19 +378,7 @@ var AddressListUI = function AddressListUI(props) {
|
|
|
360
378
|
return handleCloseAddressForm();
|
|
361
379
|
}
|
|
362
380
|
})), /*#__PURE__*/_react.default.createElement("h1", null, t('ADD_NEW_ADDRESS', 'Add new address'))), showSpreadForm && /*#__PURE__*/_react.default.createElement(_SpreadForm.SpreadForm, {
|
|
363
|
-
address: (curAddress === null || curAddress === void 0 ? void 0 : curAddress.address) &&
|
|
364
|
-
route: curAddress === null || curAddress === void 0 ? void 0 : curAddress.route,
|
|
365
|
-
street_number: curAddress === null || curAddress === void 0 ? void 0 : curAddress.street_number,
|
|
366
|
-
neighborhood: curAddress === null || curAddress === void 0 ? void 0 : curAddress.neighborhood,
|
|
367
|
-
city: curAddress === null || curAddress === void 0 ? void 0 : curAddress.city,
|
|
368
|
-
state: curAddress === null || curAddress === void 0 ? void 0 : curAddress.state,
|
|
369
|
-
country_code: curAddress === null || curAddress === void 0 ? void 0 : curAddress.country_code,
|
|
370
|
-
country: curAddress === null || curAddress === void 0 ? void 0 : curAddress.country,
|
|
371
|
-
address: curAddress === null || curAddress === void 0 ? void 0 : curAddress.address,
|
|
372
|
-
locality: curAddress === null || curAddress === void 0 ? void 0 : curAddress.locality,
|
|
373
|
-
location: curAddress === null || curAddress === void 0 ? void 0 : curAddress.location,
|
|
374
|
-
zipcode: curAddress === null || curAddress === void 0 ? void 0 : curAddress.zipcode
|
|
375
|
-
},
|
|
381
|
+
address: (curAddress === null || curAddress === void 0 ? void 0 : curAddress.address) && getSpreadAddressFormatted(curAddress),
|
|
376
382
|
countryAutocomplete: countryAutocomplete,
|
|
377
383
|
editSpreadAddress: editSpreadAddress,
|
|
378
384
|
setEditSpreadAddress: setEditSpreadAddress,
|
|
@@ -244,7 +244,7 @@ var BusinessesListingUI = function BusinessesListingUI(props) {
|
|
|
244
244
|
}, [preorderBusiness]);
|
|
245
245
|
(0, _react.useEffect)(function () {
|
|
246
246
|
var _businessesList$busin2, _businessesList$busin3, _configs$activate_sin;
|
|
247
|
-
setActiveMap(false);
|
|
247
|
+
!isCustomerMode && setActiveMap(false);
|
|
248
248
|
if (!(businessesList !== null && businessesList !== void 0 && (_businessesList$busin2 = businessesList.businesses) !== null && _businessesList$busin2 !== void 0 && _businessesList$busin2.length)) return;
|
|
249
249
|
if ((businessesList === null || businessesList === void 0 || (_businessesList$busin3 = businessesList.businesses) === null || _businessesList$busin3 === void 0 ? void 0 : _businessesList$busin3.length) === 1 && (configs === null || configs === void 0 || (_configs$activate_sin = configs.activate_single_store_automatically) === null || _configs$activate_sin === void 0 ? void 0 : _configs$activate_sin.value) === '1') {
|
|
250
250
|
onBusinessClick(businessesList === null || businessesList === void 0 ? void 0 : businessesList.businesses[0]);
|
|
@@ -44,7 +44,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
44
44
|
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; } }
|
|
45
45
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
46
46
|
var CartUI = function CartUI(props) {
|
|
47
|
-
var _configs$driver_tip_o, _configs$driver_tip_o2, _configs$driver_tip_o3, _validationFields$fie, _configs$checkout_mul, _orderState$carts, _props$cart, _validationFields$fie2, _theme$viewString, _validationFields$fie3, _theme$viewString2, _orderState$options, _orderState$options2, _cart$metafields, _cart$metafields$find, _cart$taxes, _orderState$option, _orderState$option2, _props$beforeElements, _props$beforeComponen, _cart$products, _cart$offers, _cart$offers2, _cart$offers3, _cart$offers4, _cart$business, _ref, _cart$subtotal_with_d, _cart$taxes3, _cart$taxes4, _cart$fees, _cart$fees2, _cart$offers5, _cart$offers6, _orderState$options3, _cart$taxes5, _cart$taxes6, _cart$offers7, _cart$offers8, _configs$driver_tip_t, _configs$driver_tip_u, _extraValueAdjustment, _orderState$options4, _validationFields$fie4, _configs$driver_tip_t2, _configs$driver_tip_u2, _configs$driver_tip_t3, _cart$payment_events, _cart$payment_events2, _orderState$options5, _cart$business2, _cart$business3, _curProduct$calendar_, _openTaxModal$data, _openTaxModal$data2, _openTaxModal$data3, _openTaxModal$data4, _openTaxModal$data$fi, _openTaxModal$data5, _openTaxModal$data6, _props$afterComponent, _props$afterElements;
|
|
47
|
+
var _configs$driver_tip_o, _configs$driver_tip_o2, _configs$driver_tip_o3, _validationFields$fie, _configs$checkout_mul, _orderState$carts, _props$cart, _validationFields$fie2, _theme$viewString, _validationFields$fie3, _theme$viewString2, _orderState$options, _orderState$options2, _cart$metafields, _cart$metafields$find, _cart$metafields2, _cart$metafields2$fin, _cart$taxes, _orderState$option, _orderState$option2, _props$beforeElements, _props$beforeComponen, _cart$products, _cart$offers, _cart$offers2, _cart$offers3, _cart$offers4, _cart$business, _ref, _cart$subtotal_with_d, _cart$taxes3, _cart$taxes4, _cart$fees, _cart$fees2, _cart$offers5, _cart$offers6, _orderState$options3, _cart$taxes5, _cart$taxes6, _cart$offers7, _cart$offers8, _configs$driver_tip_t, _configs$driver_tip_u, _extraValueAdjustment, _orderState$options4, _validationFields$fie4, _configs$driver_tip_t2, _configs$driver_tip_u2, _configs$driver_tip_t3, _cart$payment_events, _cart$payment_events2, _orderState$options5, _cart$business2, _cart$business3, _curProduct$calendar_, _openTaxModal$data, _openTaxModal$data2, _openTaxModal$data3, _openTaxModal$data4, _openTaxModal$data$fi, _openTaxModal$data5, _openTaxModal$data6, _props$afterComponent, _props$afterElements;
|
|
48
48
|
var currentCartUuid = props.currentCartUuid,
|
|
49
49
|
clearCart = props.clearCart,
|
|
50
50
|
isProducts = props.isProducts,
|
|
@@ -162,6 +162,9 @@ var CartUI = function CartUI(props) {
|
|
|
162
162
|
var extraValueAdjustment = cart === null || cart === void 0 || (_cart$metafields = cart.metafields) === null || _cart$metafields === void 0 || (_cart$metafields$find = _cart$metafields.find) === null || _cart$metafields$find === void 0 ? void 0 : _cart$metafields$find.call(_cart$metafields, function (meta) {
|
|
163
163
|
return (meta === null || meta === void 0 ? void 0 : meta.key) === 'extra_value_adjustment_amount';
|
|
164
164
|
});
|
|
165
|
+
var pulseCouponName = cart === null || cart === void 0 || (_cart$metafields2 = cart.metafields) === null || _cart$metafields2 === void 0 || (_cart$metafields2$fin = _cart$metafields2.find) === null || _cart$metafields2$fin === void 0 ? void 0 : _cart$metafields2$fin.call(_cart$metafields2, function (meta) {
|
|
166
|
+
return (meta === null || meta === void 0 ? void 0 : meta.key) === 'pulse_coupon_name';
|
|
167
|
+
});
|
|
165
168
|
var walletName = {
|
|
166
169
|
cash: {
|
|
167
170
|
name: t('PAY_WITH_CASH_WALLET', 'Pay with Cash Wallet')
|
|
@@ -533,7 +536,7 @@ var CartUI = function CartUI(props) {
|
|
|
533
536
|
return onRemoveOffer(offer === null || offer === void 0 ? void 0 : offer.id);
|
|
534
537
|
}
|
|
535
538
|
}))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 || (_offer$summary3 = offer.summary) === null || _offer$summary3 === void 0 ? void 0 : _offer$summary3.discount)));
|
|
536
|
-
})), (cart === null || cart === void 0 ? void 0 : cart.driver_tip) > 0 && !hideDriverTip && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', 'Driver tip'), ' ', (cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate) > 0 && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.driver_tip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)) : "- ".concat(parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) * -1)))))), isCouponEnabled && !isCartPending && (isCheckout || isCartPopover || isMultiCheckout) && !(isCheckout && isCartPopover) && !hideCartDiscount && !hideCouponInput && /*#__PURE__*/_react.default.createElement(_styles.CouponContainer, null, /*#__PURE__*/_react.default.createElement(_CouponControl.CouponControl, {
|
|
539
|
+
})), (cart === null || cart === void 0 ? void 0 : cart.driver_tip) > 0 && !hideDriverTip && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', 'Driver tip'), ' ', (cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate) > 0 && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(cart === null || cart === void 0 ? void 0 : cart.driver_tip_rate, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice(cart === null || cart === void 0 ? void 0 : cart.driver_tip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, pulseCouponName ? pulseCouponName === null || pulseCouponName === void 0 ? void 0 : pulseCouponName.value : t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)) : "- ".concat(parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) * -1)))))), isCouponEnabled && !isCartPending && (isCheckout || isCartPopover || isMultiCheckout) && !(isCheckout && isCartPopover) && !hideCartDiscount && !hideCouponInput && /*#__PURE__*/_react.default.createElement(_styles.CouponContainer, null, /*#__PURE__*/_react.default.createElement(_CouponControl.CouponControl, {
|
|
537
540
|
businessId: cart === null || cart === void 0 ? void 0 : cart.business_id,
|
|
538
541
|
price: cart === null || cart === void 0 ? void 0 : cart.total
|
|
539
542
|
})), !isStore && !isMultiCheckout && cart && (cart === null || cart === void 0 ? void 0 : cart.business_id) && (orderState === null || orderState === void 0 || (_orderState$options4 = orderState.options) === null || _orderState$options4 === void 0 ? void 0 : _orderState$options4.type) === 1 && (cart === null || cart === void 0 ? void 0 : cart.status) !== 2 && (validationFields === null || validationFields === void 0 || (_validationFields$fie4 = validationFields.fields) === null || _validationFields$fie4 === void 0 || (_validationFields$fie4 = _validationFields$fie4.checkout) === null || _validationFields$fie4 === void 0 || (_validationFields$fie4 = _validationFields$fie4.driver_tip) === null || _validationFields$fie4 === void 0 ? void 0 : _validationFields$fie4.enabled) && driverTipsOptions.length > 0 && !useKioskApp && !isCheckout && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_styles.DriverTipContainer, null, /*#__PURE__*/_react.default.createElement("h1", null, t('DRIVER_TIPS', 'Driver Tips')), /*#__PURE__*/_react.default.createElement("p", null, t('100%_OF_THE_TIP_YOUR_DRIVER', '100% of the tip goes to your driver')), /*#__PURE__*/_react.default.createElement(_DriverTips.DriverTips, {
|
|
@@ -18,7 +18,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
18
18
|
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; } }
|
|
19
19
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
20
20
|
var OrderBillSection = exports.OrderBillSection = function OrderBillSection(props) {
|
|
21
|
-
var _order$metafields, _order$metafields$fin, _theme$defaultLanguag, _order$summary$subtot, _order$summary2, _ref, _order$summary3, _order$offers, _theme$defaultLanguag2, _theme$defaultLanguag3, _order$summary$discou, _order$summary4, _order$offers2, _order$offers3, _order$summary5, _order$summary6, _order$summary7, _ref2, _order$summary8, _order$summary$subtot2, _order$summary9, _order$taxes3, _order$summary$tax2, _order$summary10, _order$fees, _order$summary$servic, _order$summary11, _order$taxes4, _order$taxes5, _order$fees2, _order$fees3, _order$offers4, _order$offers5, _order$summary12, _theme$defaultLanguag4, _order$summary13, _order$taxes6, _order$taxes7, _order$offers6, _order$offers7, _order$summary14, _theme$defaultLanguag5, _order$summary15, _configs$driver_tip_t, _configs$driver_tip_u, _order$summary$driver, _order$summary16, _extraValueAdjustment, _theme$defaultLanguag6, _order$summary$total, _order$summary17, _order$payment_events, _order$payment_events2;
|
|
21
|
+
var _order$metafields, _order$metafields$fin, _order$metafields2, _order$metafields2$fi, _theme$defaultLanguag, _order$summary$subtot, _order$summary2, _ref, _order$summary3, _order$offers, _theme$defaultLanguag2, _theme$defaultLanguag3, _order$summary$discou, _order$summary4, _order$offers2, _order$offers3, _order$summary5, _order$summary6, _order$summary7, _ref2, _order$summary8, _order$summary$subtot2, _order$summary9, _order$taxes3, _order$summary$tax2, _order$summary10, _order$fees, _order$summary$servic, _order$summary11, _order$taxes4, _order$taxes5, _order$fees2, _order$fees3, _order$offers4, _order$offers5, _order$summary12, _theme$defaultLanguag4, _order$summary13, _order$taxes6, _order$taxes7, _order$offers6, _order$offers7, _order$summary14, _theme$defaultLanguag5, _order$summary15, _configs$driver_tip_t, _configs$driver_tip_u, _order$summary$driver, _order$summary16, _extraValueAdjustment, _theme$defaultLanguag6, _order$summary$total, _order$summary17, _order$payment_events, _order$payment_events2;
|
|
22
22
|
var order = props.order,
|
|
23
23
|
setOpenTaxModal = props.setOpenTaxModal,
|
|
24
24
|
showOnlyTotals = props.showOnlyTotals;
|
|
@@ -46,6 +46,9 @@ var OrderBillSection = exports.OrderBillSection = function OrderBillSection(prop
|
|
|
46
46
|
var extraValueAdjustment = order === null || order === void 0 || (_order$metafields = order.metafields) === null || _order$metafields === void 0 || (_order$metafields$fin = _order$metafields.find) === null || _order$metafields$fin === void 0 ? void 0 : _order$metafields$fin.call(_order$metafields, function (meta) {
|
|
47
47
|
return (meta === null || meta === void 0 ? void 0 : meta.key) === 'extra_value_adjustment_amount';
|
|
48
48
|
});
|
|
49
|
+
var pulseCouponName = order === null || order === void 0 || (_order$metafields2 = order.metafields) === null || _order$metafields2 === void 0 || (_order$metafields2$fi = _order$metafields2.find) === null || _order$metafields2$fi === void 0 ? void 0 : _order$metafields2$fi.call(_order$metafields2, function (meta) {
|
|
50
|
+
return (meta === null || meta === void 0 ? void 0 : meta.key) === 'pulse_coupon_name';
|
|
51
|
+
});
|
|
49
52
|
var getIncludedTaxes = function getIncludedTaxes(isDeliveryFee) {
|
|
50
53
|
var _order$taxes;
|
|
51
54
|
if ((order === null || order === void 0 || (_order$taxes = order.taxes) === null || _order$taxes === void 0 ? void 0 : _order$taxes.length) === 0) {
|
|
@@ -175,7 +178,7 @@ var OrderBillSection = exports.OrderBillSection = function OrderBillSection(prop
|
|
|
175
178
|
size: "20",
|
|
176
179
|
color: theme.colors.primary
|
|
177
180
|
}))), /*#__PURE__*/_react.default.createElement("td", null, "- ", parsePrice(offer === null || offer === void 0 || (_offer$summary3 = offer.summary) === null || _offer$summary3 === void 0 ? void 0 : _offer$summary3.discount)));
|
|
178
|
-
})), ((order === null || order === void 0 || (_order$summary14 = order.summary) === null || _order$summary14 === void 0 ? void 0 : _order$summary14.driver_tip) > 0 || (order === null || order === void 0 ? void 0 : order.driver_tip) > 0) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', (theme === null || theme === void 0 || (_theme$defaultLanguag5 = theme.defaultLanguages) === null || _theme$defaultLanguag5 === void 0 ? void 0 : _theme$defaultLanguag5.DRIVER_TIP) || 'Driver tip'), ' ', ((order === null || order === void 0 || (_order$summary15 = order.summary) === null || _order$summary15 === void 0 ? void 0 : _order$summary15.driver_tip) > 0 || (order === null || order === void 0 ? void 0 : order.driver_tip) > 0) && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(order === null || order === void 0 ? void 0 : order.driver_tip, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((_order$summary$driver = order === null || order === void 0 || (_order$summary16 = order.summary) === null || _order$summary16 === void 0 ? void 0 : _order$summary16.driver_tip) !== null && _order$summary$driver !== void 0 ? _order$summary$driver : order === null || order === void 0 ? void 0 : order.totalDriverTip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)) : "- ".concat(parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) * -1))))))), /*#__PURE__*/_react.default.createElement("table", {
|
|
181
|
+
})), ((order === null || order === void 0 || (_order$summary14 = order.summary) === null || _order$summary14 === void 0 ? void 0 : _order$summary14.driver_tip) > 0 || (order === null || order === void 0 ? void 0 : order.driver_tip) > 0) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('DRIVER_TIP', (theme === null || theme === void 0 || (_theme$defaultLanguag5 = theme.defaultLanguages) === null || _theme$defaultLanguag5 === void 0 ? void 0 : _theme$defaultLanguag5.DRIVER_TIP) || 'Driver tip'), ' ', ((order === null || order === void 0 || (_order$summary15 = order.summary) === null || _order$summary15 === void 0 ? void 0 : _order$summary15.driver_tip) > 0 || (order === null || order === void 0 ? void 0 : order.driver_tip) > 0) && parseInt(configs === null || configs === void 0 || (_configs$driver_tip_t = configs.driver_tip_type) === null || _configs$driver_tip_t === void 0 ? void 0 : _configs$driver_tip_t.value, 10) === 2 && !parseInt(configs === null || configs === void 0 || (_configs$driver_tip_u = configs.driver_tip_use_custom) === null || _configs$driver_tip_u === void 0 ? void 0 : _configs$driver_tip_u.value, 10) && /*#__PURE__*/_react.default.createElement("span", null, "(".concat((0, _utils.verifyDecimals)(order === null || order === void 0 ? void 0 : order.driver_tip, parseNumber), "%)"))), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((_order$summary$driver = order === null || order === void 0 || (_order$summary16 = order.summary) === null || _order$summary16 === void 0 ? void 0 : _order$summary16.driver_tip) !== null && _order$summary$driver !== void 0 ? _order$summary$driver : order === null || order === void 0 ? void 0 : order.totalDriverTip))), extraValueAdjustment && !!parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) && /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, pulseCouponName ? pulseCouponName === null || pulseCouponName === void 0 ? void 0 : pulseCouponName.value : t(extraValueAdjustment === null || extraValueAdjustment === void 0 || (_extraValueAdjustment = extraValueAdjustment.key) === null || _extraValueAdjustment === void 0 ? void 0 : _extraValueAdjustment.toUpperCase(), extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.key), ' '), /*#__PURE__*/_react.default.createElement("td", null, parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value)) : "- ".concat(parsePrice(parseFloat(extraValueAdjustment === null || extraValueAdjustment === void 0 ? void 0 : extraValueAdjustment.value) * -1))))))), /*#__PURE__*/_react.default.createElement("table", {
|
|
179
182
|
className: "total"
|
|
180
183
|
}, /*#__PURE__*/_react.default.createElement("tbody", null, /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", null, t('TOTAL', (theme === null || theme === void 0 || (_theme$defaultLanguag6 = theme.defaultLanguages) === null || _theme$defaultLanguag6 === void 0 ? void 0 : _theme$defaultLanguag6.TOTAL) || 'Total')), /*#__PURE__*/_react.default.createElement("td", null, parsePrice((_order$summary$total = order === null || order === void 0 || (_order$summary17 = order.summary) === null || _order$summary17 === void 0 ? void 0 : _order$summary17.total) !== null && _order$summary$total !== void 0 ? _order$summary$total : order === null || order === void 0 ? void 0 : order.total))))), (order === null || order === void 0 || (_order$payment_events = order.payment_events) === null || _order$payment_events === void 0 ? void 0 : _order$payment_events.length) > 0 && !showOnlyTotals && /*#__PURE__*/_react.default.createElement("div", {
|
|
181
184
|
style: {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ordering-ui-external",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.1.43",
|
|
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.38",
|
|
92
92
|
"payment": "^2.4.6",
|
|
93
93
|
"polished": "^3.6.6",
|
|
94
94
|
"react-bootstrap-icons": "^1.7.2",
|
|
@@ -48,12 +48,12 @@ export const SpreadForm = (props) => {
|
|
|
48
48
|
const [{ token: sessionToken }] = useSession()
|
|
49
49
|
const [{ configs }] = useConfig()
|
|
50
50
|
const [, t] = useLanguage()
|
|
51
|
-
const [formState, setFormState] = useState({ changes: {}, loading: false, error: null, added:
|
|
51
|
+
const [formState, setFormState] = useState({ changes: {}, loading: false, error: null, added: !!address?.location })
|
|
52
52
|
|
|
53
53
|
const googleMapsApiKey = configs?.google_maps_api_key?.value
|
|
54
54
|
|
|
55
55
|
const handleAddAddress = () => {
|
|
56
|
-
onChangeAddress(formState.changes)
|
|
56
|
+
onChangeAddress({ ...formState.changes, verified: !!formState?.previousResponseId })
|
|
57
57
|
setFormState({ ...formState, added: true })
|
|
58
58
|
editSpreadAddress && setEditSpreadAddress(!editSpreadAddress)
|
|
59
59
|
}
|
|
@@ -390,7 +390,17 @@ const AddressFormUI = (props) => {
|
|
|
390
390
|
|
|
391
391
|
useEffect(() => {
|
|
392
392
|
if (addressSpreadForm) {
|
|
393
|
-
|
|
393
|
+
if (!isEditing) {
|
|
394
|
+
handleChangeAddress(addressSpreadForm, true)
|
|
395
|
+
} else {
|
|
396
|
+
setLocationChange(addressSpreadForm?.location)
|
|
397
|
+
if (addressSpreadForm?.verified) {
|
|
398
|
+
const values = addressSpreadForm
|
|
399
|
+
delete values.verified
|
|
400
|
+
setSelectedFromAutocomplete(true)
|
|
401
|
+
updateChanges(values)
|
|
402
|
+
}
|
|
403
|
+
}
|
|
394
404
|
}
|
|
395
405
|
}, [addressSpreadForm])
|
|
396
406
|
|
|
@@ -52,6 +52,23 @@ import { useTheme } from 'styled-components'
|
|
|
52
52
|
import { scrollTo } from '../../../../../utils'
|
|
53
53
|
import { SpreadForm } from '../AddressForm/SpreadForm'
|
|
54
54
|
|
|
55
|
+
const getSpreadAddressFormatted = (_address, restValues = {}) => {
|
|
56
|
+
return {
|
|
57
|
+
route: _address?.route,
|
|
58
|
+
street_number: _address?.street_number,
|
|
59
|
+
neighborhood: _address?.neighborhood,
|
|
60
|
+
city: _address?.city,
|
|
61
|
+
state: _address?.state,
|
|
62
|
+
country_code: _address?.country_code,
|
|
63
|
+
country: _address?.country,
|
|
64
|
+
address: _address?.address,
|
|
65
|
+
locality: _address?.locality,
|
|
66
|
+
location: _address?.location,
|
|
67
|
+
zipcode: _address?.zipcode,
|
|
68
|
+
...restValues
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
55
72
|
const AddressListUI = (props) => {
|
|
56
73
|
const {
|
|
57
74
|
actionStatus,
|
|
@@ -107,6 +124,7 @@ const AddressListUI = (props) => {
|
|
|
107
124
|
|
|
108
125
|
const openAddress = (address) => {
|
|
109
126
|
setCurAddress(address)
|
|
127
|
+
address?.location && setAddressSpreadForm(getSpreadAddressFormatted(address))
|
|
110
128
|
setAddressOpen(true)
|
|
111
129
|
setIsAddressFormOpen && setIsAddressFormOpen(true)
|
|
112
130
|
const container = window.document.getElementsByClassName('form_edit')[0]
|
|
@@ -202,6 +220,7 @@ const AddressListUI = (props) => {
|
|
|
202
220
|
const handleCloseAddressForm = () => {
|
|
203
221
|
setAddressOpen(false)
|
|
204
222
|
setIsAddressFormOpen && setIsAddressFormOpen(false)
|
|
223
|
+
setEditSpreadAddress(false)
|
|
205
224
|
}
|
|
206
225
|
|
|
207
226
|
/**
|
|
@@ -398,19 +417,7 @@ const AddressListUI = (props) => {
|
|
|
398
417
|
</TitleFormContainer>
|
|
399
418
|
{showSpreadForm && (
|
|
400
419
|
<SpreadForm
|
|
401
|
-
address={curAddress?.address &&
|
|
402
|
-
route: curAddress?.route,
|
|
403
|
-
street_number: curAddress?.street_number,
|
|
404
|
-
neighborhood: curAddress?.neighborhood,
|
|
405
|
-
city: curAddress?.city,
|
|
406
|
-
state: curAddress?.state,
|
|
407
|
-
country_code: curAddress?.country_code,
|
|
408
|
-
country: curAddress?.country,
|
|
409
|
-
address: curAddress?.address,
|
|
410
|
-
locality: curAddress?.locality,
|
|
411
|
-
location: curAddress?.location,
|
|
412
|
-
zipcode: curAddress?.zipcode
|
|
413
|
-
}}
|
|
420
|
+
address={curAddress?.address && getSpreadAddressFormatted(curAddress)}
|
|
414
421
|
countryAutocomplete={countryAutocomplete}
|
|
415
422
|
editSpreadAddress={editSpreadAddress}
|
|
416
423
|
setEditSpreadAddress={setEditSpreadAddress}
|
package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js
CHANGED
|
@@ -28,7 +28,6 @@ import {
|
|
|
28
28
|
TypesContainer,
|
|
29
29
|
TypeButton,
|
|
30
30
|
IconTypeButton,
|
|
31
|
-
TypesWrapper,
|
|
32
31
|
AdditionalTypesContainer
|
|
33
32
|
} from './styles'
|
|
34
33
|
import { useWindowSize } from '../../../../../../../hooks/useWindowSize'
|
|
@@ -201,7 +200,7 @@ const BusinessesListingUI = (props) => {
|
|
|
201
200
|
}, [preorderBusiness])
|
|
202
201
|
|
|
203
202
|
useEffect(() => {
|
|
204
|
-
setActiveMap(false)
|
|
203
|
+
!isCustomerMode && setActiveMap(false)
|
|
205
204
|
if (!businessesList?.businesses?.length) return
|
|
206
205
|
if (businessesList?.businesses?.length === 1 && configs?.activate_single_store_automatically?.value === '1') {
|
|
207
206
|
onBusinessClick(businessesList?.businesses[0])
|
|
@@ -125,6 +125,7 @@ const CartUI = (props) => {
|
|
|
125
125
|
|
|
126
126
|
const cateringValues = businessConfigs && getCateringValues(cateringTypeString, businessConfigs)
|
|
127
127
|
const extraValueAdjustment = cart?.metafields?.find?.(meta => meta?.key === 'extra_value_adjustment_amount')
|
|
128
|
+
const pulseCouponName = cart?.metafields?.find?.(meta => meta?.key === 'pulse_coupon_name')
|
|
128
129
|
|
|
129
130
|
const walletName = {
|
|
130
131
|
cash: {
|
|
@@ -514,7 +515,7 @@ const CartUI = (props) => {
|
|
|
514
515
|
{extraValueAdjustment && !!parseFloat(extraValueAdjustment?.value) && (
|
|
515
516
|
<tr>
|
|
516
517
|
<td>
|
|
517
|
-
{t(extraValueAdjustment?.key?.toUpperCase(), extraValueAdjustment?.key)}{' '}
|
|
518
|
+
{pulseCouponName ? pulseCouponName?.value : t(extraValueAdjustment?.key?.toUpperCase(), extraValueAdjustment?.key)}{' '}
|
|
518
519
|
</td>
|
|
519
520
|
<td>{parseFloat(extraValueAdjustment?.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment?.value)) : `- ${parsePrice(parseFloat(extraValueAdjustment?.value) * -1)}`}</td>
|
|
520
521
|
</tr>
|
|
@@ -36,7 +36,7 @@ export const OrderBillSection = (props) => {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
const extraValueAdjustment = order?.metafields?.find?.(meta => meta?.key === 'extra_value_adjustment_amount')
|
|
39
|
-
|
|
39
|
+
const pulseCouponName = order?.metafields?.find?.(meta => meta?.key === 'pulse_coupon_name')
|
|
40
40
|
const getIncludedTaxes = (isDeliveryFee) => {
|
|
41
41
|
if (order?.taxes?.length === 0) {
|
|
42
42
|
return order.tax_type === 1 ? order?.summary?.tax ?? 0 : 0
|
|
@@ -245,7 +245,7 @@ export const OrderBillSection = (props) => {
|
|
|
245
245
|
{extraValueAdjustment && !!parseFloat(extraValueAdjustment?.value) && (
|
|
246
246
|
<tr>
|
|
247
247
|
<td>
|
|
248
|
-
{t(extraValueAdjustment?.key?.toUpperCase(), extraValueAdjustment?.key)}{' '}
|
|
248
|
+
{pulseCouponName ? pulseCouponName?.value : t(extraValueAdjustment?.key?.toUpperCase(), extraValueAdjustment?.key)}{' '}
|
|
249
249
|
</td>
|
|
250
250
|
<td>{parseFloat(extraValueAdjustment?.value) > 0 ? parsePrice(parseFloat(extraValueAdjustment?.value)) : `- ${parsePrice(parseFloat(extraValueAdjustment?.value) * -1)}`}</td>
|
|
251
251
|
</tr>
|
/package/_bundles/{0.ordering-ui.2a09e7e0162e34ea955c.js → 0.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|
/package/_bundles/{1.ordering-ui.2a09e7e0162e34ea955c.js → 1.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|
/package/_bundles/{2.ordering-ui.2a09e7e0162e34ea955c.js → 2.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|
/package/_bundles/{4.ordering-ui.2a09e7e0162e34ea955c.js → 4.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|
/package/_bundles/{5.ordering-ui.2a09e7e0162e34ea955c.js → 5.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|
/package/_bundles/{6.ordering-ui.2a09e7e0162e34ea955c.js → 6.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|
|
File without changes
|
/package/_bundles/{8.ordering-ui.2a09e7e0162e34ea955c.js → 8.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|
/package/_bundles/{9.ordering-ui.2a09e7e0162e34ea955c.js → 9.ordering-ui.8affcf551a37ff54e392.js}
RENAMED
|
File without changes
|