Merge pull request bigcommerce#2557 from bigcommerce/ORDERS-7036

refactor(orders): ORDERS-7036 refactor orders/invoice.html pickup_details section to better align with existing pickup_address output

Author: matt-evangelidis

CHANGELOG.md

@@ -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
+- Add net-new "order.pickup_addresses" to unify objects used on Order Details and Order Invoice pages [#2557](https://github.com/bigcommerce/cornerstone/pull/2557)
 
 ## 6.16.2 (06-18-2025)
 - Restore indentation and quote rules to match BC Sass Style Guide [#2554](https://github.com/bigcommerce/cornerstone/pull/2554)

templates/pages/account/orders/details.html

@@ -64,10 +64,10 @@ <h3 class="account-heading">{{lang 'account.orders.details.ship_to'}}</h3>
                     </ul>
                 </section>
             {{/if}}
-            {{#if order.pickup_address}}
+            {{#if order.pickup_addresses}}
             <section class="account-sidebar-block">
                 <h3 class="account-heading">{{lang 'account.orders.details.pickup'}}</h3>
-                {{#each order.pickup_address}}
+                {{#each order.pickup_addresses}}
                 <dl class="definitionList">
                     <dt class="definitionList-key">{{lang 'account.orders.details.pickup_method'}}</dt>
                     <dd class="definitionList-value">{{sanitize pickup_method_display_name}}</dd>
@@ -86,7 +86,7 @@ <h3 class="account-heading">{{lang 'account.orders.details.pickup'}}</h3>
                     <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}}
+                    {{#if location_email}}
                     <dt class="definitionList-key">{{lang 'account.orders.details.email'}}</dt>
                     <dd class="definitionList-value">{{{ sanitize location_email}}}</dd>
                     {{/if}}

templates/pages/account/orders/invoice.html

@@ -56,18 +56,20 @@ <h3>{{lang 'account.orders.details.ship_to'}}</h3>
                     </div>
                 {{/unless}}
             {{/if}}
-            {{#if order.pickup_address}}
+            {{#if order.pickup_addresses}}
                 {{#unless order.has_multiple_shipping_addresses}}
                     <div class="ShippingAddress">
                         <h3>{{lang 'account.orders.details.pickup_details'}}</h3>
                         <ul>
-                            <li><strong>{{order.pickup_address.line1}}</strong></li>
-                            <li>{{order.pickup_address.line2}}</li>
-                            <li>{{order.pickup_address.city}}, {{order.pickup_address.state}} {{order.pickup_address.zip}}</li>
-                            <li>{{order.pickup_address.country}}</li>
+                            {{#each order.pickup_addresses}}
+                            <li><strong>{{location_line_1}}</strong></li>
+                            <li>{{location_line_2}}</li>
+                            <li>{{location_city}}, {{location_state}} {{location_zip}}</li>
+                            <li>{{location_country_name}}</li>
                             <li>&nbsp;</li>
-                            <li>{{lang 'invoice.phone' number=order.pickup_address.phone}}</li>
-                            {{#if order.pickup_address.email}}<li>{{lang 'invoice.email' email=order.pickup_address.email}}</li>{{/if}}
+                            <li>{{lang 'invoice.phone' number=location_phone}}</li>
+                            {{#if location_email}}<li>{{lang 'invoice.email' email=location_email}}</li>{{/if}}
+                            {{/each}}
                         </ul>
                     </div>
                 {{/unless}}