Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Draft
- Update 'Ship to' copy for multi address orders [#2655](https://github.com/bigcommerce/cornerstone/pull/2655)
- Fixed typo in category page reset-filters live region handler [#2643](https://github.com/bigcommerce/cornerstone/pull/2643)
- Swap content/data keys in onProductOptionsChanged event detail [#2640](https://github.com/bigcommerce/cornerstone/pull/2640)
- Fix shipment info showing for cancelled orders [#2654](https://github.com/bigcommerce/cornerstone/pull/2654)
Expand Down
2 changes: 1 addition & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@
"heading": "Order #{number}",
"order_contents": "Order Contents",
"ship_to": "Ship To",
"ship_to_multi": "Items shipped to {street}, {city}, {state}, {zip}, {country}",
"ship_to_multi": "Ship to {street}, {city}, {state}, {zip}, {country}",
"ship_to_multi_text": "Order will be shipped to multiple addresses",
"pickup_details": "Pickup Details",
"bill_to": "Bill To",
Expand Down
16 changes: 6 additions & 10 deletions templates/components/account/order-contents.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ <h3 class="account-heading">{{lang 'account.orders.details.order_contents'}}</h3

<ul class="account-list">
{{#each order.items}}
{{#if ../order.is_complete}}
{{#if shipping_rows.length}}
{{#each shipping_rows}}
{{#if is_shipping}}
<li class="account-listShipping">
<h5 class="account-listShipping-title">{{lang 'account.orders.details.ship_to_multi' street=address city=city state=state zip=zip country=country}}</h5>
</li>
{{/if}}
{{/each}}
{{#each shipping_rows}}
{{#if is_shipping}}
<li class="account-listShipping">
<h5 class="account-listShipping-title">{{lang 'account.orders.details.ship_to_multi' street=address city=city state=state zip=zip country=country}}</h5>
</li>
{{/if}}
{{/if}}
{{/each}}
<li class="account-listItem">
<div class="account-product account-product--alignMiddle">
<div class="account-product-checkItem">
Expand Down
Loading