feat(orders): ORDERS-3932 Changes to allow pickup details to be displ…

…ayed in storefront
bigcommerce · Apr 11, 2022 · 83d0450 · 83d0450
1 parent f77c1f6
commit 83d0450
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Draft
 - 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)
+- 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)

diff --git a/lang/en.json b/lang/en.json
@@ -364,7 +364,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",

diff --git a/templates/pages/account/orders/details.html b/templates/pages/account/orders/details.html
@@ -54,7 +54,7 @@ <h3 class="account-heading">{{lang 'account.orders.details.order_details'}}</h3>
             {{#if order.shipping_address}}
                 <section class="account-sidebar-block">
                     <h3 class="account-heading">{{lang 'account.orders.details.ship_to'}}</h3>
-                    <ul class="account-order-address">
+                        <ul class="account-order-address">
                         <li>{{{ sanitize order.shipping_address.full_name}}}</li>
                         <li>{{{ sanitize order.shipping_address.company}}}</li>
                         <li>{{{ sanitize order.shipping_address.address_lines.[0]}}}</li>
@@ -63,6 +63,38 @@ <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>
+                <dl class="definitionList">
+                    <dt class="definitionList-key">{{lang 'account.orders.details.pickup_method'}}</dt>
+                    <dd class="definitionList-value">{{lang 'account.orders.details.pickup_method'}}</dd>
+                </dl>
+                <ul class="account-order-address">
+                    <li><b>{{{ sanitize order.pickup_address.location_name}}}</b></li>
+                    <li>{{{ sanitize order.pickup_address.location_line_1}}}</li>
+                    <li>{{{ sanitize order.pickup_address.location_line_2}}}</li>
+                    <li>{{{ sanitize order.pickup_address.location_city}}}, {{{ sanitize order.pickup_address.location_state}}}, {{{ sanitize order.pickup_address.location_zip}}}</li>
+                    <li>{{{ sanitize order.pickup_address.location_country_name}}}</li>
+                </ul>
+
+                <dl class="definitionList">
+                    {{#if order.pickup_address.location_phone}}
+                    <dt class="definitionList-key">{{lang 'account.orders.details.phone'}}</dt>
+                    <dd class="definitionList-value">{{{ sanitize order.pickup_address.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 order.pickup_address.location_email}}}</dd>
+                    {{/if}}
+                </dl>
+
+                <ul class="account-order-address">
+                    <li><b>{{{ lang 'account.orders.details.opening_hours'}}}</b></li>
+                    <li>{{{ sanitize order.pickup_address.collection_time_description}}}</li>
+                </ul>
+            </section>
             {{else}}
                 {{#if order.has_multiple_shipping_addresses}}
                     <section class="account-sidebar-block">