Skip to content

Commit 143ec67

Browse files
committed
ACP2E-1105: keep new lines on street added through checkout
1 parent 9034093 commit 143ec67

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ define([
4040
regionCode: addressData.region ? addressData.region['region_code'] : null,
4141
region: addressData.region ? addressData.region.region : null,
4242
customerId: addressData['customer_id'] || addressData.customerId,
43-
street: addressData.street ? _.compact(addressData.street) : addressData.street,
43+
street: addressData.street,
4444
company: addressData.company,
4545
telephone: addressData.telephone,
4646
fax: addressData.fax,

app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<if args="currentBillingAddress().company">
1212
<text args="currentBillingAddress().company"></text><br>
1313
</if>
14-
<text args="_.values(currentBillingAddress().street).join(', ')"></text><br>
14+
<text args="_.values(_.compact(currentBillingAddress().street)).join(', ')"></text><br>
1515
<text args="currentBillingAddress().city "></text>, <span text="currentBillingAddress().region"></span>
1616
<text args="currentBillingAddress().postcode"></text><br>
1717
<text args="getCountryName(currentBillingAddress().countryId)"></text><br>

app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<if args="address().company">
1111
<text args="address().company"></text><br>
1212
</if>
13-
<text args="_.values(address().street).join(', ')"></text><br>
13+
<text args="_.values(_.compact(address().street)).join(', ')"></text><br>
1414
<text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br>
1515
<text args="getCountryName(address().countryId)"></text><br>
1616
<a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>

app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<if args="address().company">
1111
<text args="address().company"></text><br>
1212
</if>
13-
<text args="_.values(address().street).join(', ')"></text><br>
13+
<text args="_.values(_.compact(address().street)).join(', ')"></text><br>
1414
<text args="address().city "></text>, <span text="address().region"></span> <text args="address().postcode"></text><br>
1515
<text args="getCountryName(address().countryId)"></text><br>
1616
<a if="address().telephone" attr="'href': 'tel:' + address().telephone" text="address().telephone"></a><br>

app/code/Magento/Customer/view/adminhtml/web/template/default-address.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</if>
2727
<if args="address.street">
2828
<text args="address.street" if="_.isString(address.street)"></text>
29-
<text args="_.filter(_.values(address.street), function (value) { return _.isString(value)}).join(', ')"
29+
<text args="_.filter(_.values(_.compact(address.street)), function (value) { return _.isString(value)}).join(', ')"
3030
ifnot="_.isString(address.street)"></text>
3131
<br/>
3232
</if>

0 commit comments

Comments
 (0)