Skip to content

Commit

Permalink
feat(orders): ORDERS-3932 Changes to allow pickup details to be displ…
Browse files Browse the repository at this point in the history
…ayed in storefront
  • Loading branch information
bc-munjal committed May 1, 2022
1 parent 0767e4b commit b5c885a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Remove translations for adminBar component [#2196](https://github.com/bigcommerce/cornerstone/issues/2196)
- Remove adminBar. [#2191](https://github.com/bigcommerce/cornerstone/issues/2191)
- When price list price is set for currency, the cart does not respect product's price.[#2190](https://github.com/bigcommerce/cornerstone/issues/2190)
- Stored Payment Methods form can be submitted without selecting a Country.[#2194](https://github.com/bigcommerce/cornerstone/issues/2194)
- Show pickup details in storefront for BOPIS orders. [#2199](https://github.com/bigcommerce/cornerstone/pull/2199)

## 6.3.0 (03-11-2022)
- Update blog component to use H1 tags on posts [#2179](https://github.com/bigcommerce/cornerstone/issues/2179)
Expand Down
8 changes: 7 additions & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,13 @@
"actions": "Actions",
"reorder": "Reorder",
"return": "Return",
"print_invoice": "Print Invoice"
"pickup": "Pickup Details",
"pickup_method": "Pickup method",
"in_store_pickup": "In-store pickup",
"print_invoice": "Print Invoice",
"phone": "Phone",
"email": "Email",
"opening_hours": "Opening hours"
},
"downloads": {
"heading": "Order #{number} Downloads",
Expand Down
35 changes: 35 additions & 0 deletions templates/pages/account/orders/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,41 @@ <h3 class="account-heading">{{lang 'account.orders.details.ship_to'}}</h3>
<li>{{{ sanitize order.shipping_address.country}}}</li>
</ul>
</section>
{{/if}}
{{#if order.pickup_address}}
<section class="account-sidebar-block">
<h3 class="account-heading">{{lang 'account.orders.details.pickup'}}</h3>
{{#each order.pickup_address}}
<dl class="definitionList">
<dt class="definitionList-key">{{lang 'account.orders.details.pickup_method'}}</dt>
<dd class="definitionList-value">{{sanitize pickup_method_display_name}}</dd>
</dl>

<ul class="account-order-address">
<li><b>{{{ sanitize location_name}}}</b></li>
<li>{{{ sanitize location_line_1}}}</li>
<li>{{{ sanitize location_line_2}}}</li>
<li>{{{ sanitize location_city}}}, {{{ sanitize location_state}}}, {{{ sanitize location_zip}}}</li>
<li>{{{ sanitize location_country_name}}}</li>
</ul>

<dl class="definitionList">
{{#if location_phone}}
<dt class="definitionList-key">{{lang 'account.orders.details.phone'}}</dt>
<dd class="definitionList-value">{{{ sanitize location_phone}}}</dd>
{{/if}}
{{#if order.pickup_address.location_email}}
<dt class="definitionList-key">{{lang 'account.orders.details.email'}}</dt>
<dd class="definitionList-value">{{{ sanitize location_email}}}</dd>
{{/if}}
</dl>

<ul class="account-order-address">
<li><b>{{{ lang 'account.orders.details.opening_hours'}}}</b></li>
<li>{{{ sanitize collection_time_description}}}</li>
</ul>
{{/each}}
</section>
{{else}}
{{#if order.has_multiple_shipping_addresses}}
<section class="account-sidebar-block">
Expand Down

0 comments on commit b5c885a

Please sign in to comment.