Skip to content

Commit 87f0be7

Browse files
committed
ACP2E-227: Shipping street address is not cleared completely after removing from the input box
1 parent 68205af commit 87f0be7

File tree

1 file changed

+22
-7
lines changed
  • app/code/Magento/Checkout/view/frontend/web/js/view

1 file changed

+22
-7
lines changed

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,31 @@ define([
121121
);
122122
}
123123
checkoutProvider.on('shippingAddress', function (shippingAddrsData, changes) {
124-
if (changes && changes.length > 0) {
125-
var change = changes.pop()
126-
if (change.path === "shippingAddress.street.0" && !_.isUndefined(change.value) && change.value.length === 0 && !_.isUndefined(change.oldValue) && change.oldValue.length > 0) {
127-
checkoutData.setShippingAddressFromData(shippingAddrsData);
124+
var isStreetAddressDeleted = function (changes) {
125+
var change;
126+
127+
if (!changes || changes.length === 0) {
128+
return false;
128129
}
129-
}
130-
if (shippingAddrsData.street && (!_.isEmpty(shippingAddrsData.street[0]))) {
130+
131+
change = changes.pop();
132+
133+
if (!_.isUndefined(change.value) || !_.isUndefined(change.oldValue)) {
134+
return false;
135+
}
136+
137+
if (change.path !== "shippingAddress.street.0") {
138+
return false;
139+
}
140+
141+
return change.value.length === 0 && change.oldValue.length > 0;
142+
}, isStreetAddressNotEmpty = shippingAddrsData.street && !_.isEmpty(shippingAddrsData.street[0]);
143+
144+
145+
if (isStreetAddressNotEmpty || isStreetAddressDeleted(changes)) {
131146
checkoutData.setShippingAddressFromData(shippingAddrsData);
132147
}
133-
});
148+
})
134149
shippingRatesValidator.initFields(fieldsetName);
135150
});
136151

0 commit comments

Comments
 (0)