@W-19688128 Order Details supports multiship and BOPIS (#3414)

Author: patricksullivansf

packages/template-retail-react-app/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## v8.2.0-dev (Sep 26, 2025)
 - [Bugfix] Fix footer heading semantic consistency and alignment. Fix accessibility compliance by adding proper h1 headings to checkout pages to resolve the page-has-heading-one accessibility rule violation. [#3398](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3398)
 - [Bugfix] Use `serverSafeEncode` util for address mutations. [#3380](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3380)
+- My Account Order Details page correctly shows orders with BOPIS and with Multiple shipments [#3414](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3414)
+- Fix bug where pick up items were displaying delivery stock levels instead of in store stock levels [#3401](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3401) 
+- When registering a guest user on the confirmation page only save the delivery addresses to the new account
+[#3412](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3412)
+
 ## v8.1.0 (Sep 25, 2025)
 - Updated search UX - prices, images, suggestions new layout [#3271](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3271)
 - Updated the UI for StoreDisplay component which displays pickup in-store information on different pages. [#3248](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3248)
@@ -9,11 +14,8 @@
 - Enhanced the shopping assistant that integrates Salesforce Embedded Messaging Service with PWA Kit applications, adding comprehensive context support, localization capabilities, and improved user experience features. [#3259](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3259)
 - Removed domainUrl, locale, basetId properties as part off the ShopperAgent during initialization. [#3259](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3259)
 - Only show option to deliver to multiple addresses if there are multiple items in the basket. [#3336](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3336)
-- When registering a guest user on the confirmation page only save the delivery addresses to the new account
-[#3412](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3412) 
 - Added support for Choice of Bonus Products feature. Users can now select from available bonus products when they qualify for the associated promotion. The bonus product selection flow can be entered from either the "Item Added to Cart" modal (when adding the qualifying product to the cart) or from the cart page. [#3292] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3292)
 - Add @h4ad/serverless-adapter to jest config [#3325](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3325)
-- Fix bug where pick up items were displaying delivery stock levels instead of in store stock levels [#3401](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3401) 
 
 ## v8.0.0 (Sep 04, 2025)
 - Add support for environment level base paths on /mobify routes [#2892](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2892)

packages/template-retail-react-app/app/components/multiship/multiship-order-summary.jsx

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import React from 'react'
+import React, {useMemo} from 'react'
 import {defineMessages, FormattedMessage} from 'react-intl'
 import PropTypes from 'prop-types'
 import {
@@ -21,13 +21,16 @@ import CartItemVariantAttributes from '@salesforce/retail-react-app/app/componen
 import CartItemVariantPrice from '@salesforce/retail-react-app/app/components/item-variant/item-price'
 import {STORE_LOCATOR_IS_ENABLED} from '@salesforce/retail-react-app/app/constants'
 import {getConfig} from '@salesforce/pwa-kit-runtime/utils/ssr-config'
-import {isPickupShipment} from '@salesforce/retail-react-app/app/utils/shipment-utils'
+import {groupShipmentsByDeliveryOption} from '@salesforce/retail-react-app/app/utils/shipment-utils'
 
 const MultiShipOrderSummary = ({order, productItemsMap, currency}) => {
     const storeLocatorEnabled = getConfig()?.app?.storeLocatorEnabled ?? STORE_LOCATOR_IS_ENABLED
     // Group shipments by type (pickup vs delivery)
-    const pickupShipments = []
-    const deliveryShipments = []
+    const {pickupShipments, deliveryShipments} = useMemo(() => {
+        return storeLocatorEnabled
+            ? groupShipmentsByDeliveryOption(order)
+            : {pickupShipments: [], deliveryShipments: order?.shipments || []}
+    }, [order?.shipments, storeLocatorEnabled])
 
     const messages = defineMessages({
         pickupItems: {
@@ -40,16 +43,6 @@ const MultiShipOrderSummary = ({order, productItemsMap, currency}) => {
         }
     })
 
-    order.shipments.forEach((shipment) => {
-        const isPickup = storeLocatorEnabled && isPickupShipment(shipment)
-
-        if (isPickup) {
-            pickupShipments.push(shipment)
-        } else {
-            deliveryShipments.push(shipment)
-        }
-    })
-
     // Group product items by shipment
     const getItemsForShipment = (shipmentId) => {
         return order.productItems.filter((item) => item.shipmentId === shipmentId)

packages/template-retail-react-app/app/mocks/mock-data.js

@@ -5760,3 +5760,103 @@ export const mockBasketWithBonusProducts = {
     ],
     total: 1
 }
+
+export const mockStore = {
+    data: [
+        {
+            id: '00001',
+            name: 'Downtown Store',
+            address1: '100 Market St',
+            city: 'San Francisco',
+            stateCode: 'CA',
+            postalCode: '94105',
+            phone: '(415) 555-0001'
+        }
+    ]
+}
+
+export const mockMultiShipmentOrder = {
+    ...mockOrderHistory.data[0],
+    orderNo: '00099003',
+    productItems: [
+        {
+            ...mockOrderHistory.data[0].productItems[0],
+            shipmentId: 'pickup1',
+            itemId: 'item1'
+        },
+        {
+            ...mockOrderHistory.data[0].productItems[1],
+            shipmentId: 'delivery1',
+            itemId: 'item2'
+        }
+    ],
+    shipments: [
+        {
+            adjustedMerchandizeTotalTax: 1.5,
+            adjustedShippingTotalTax: 0,
+            gift: false,
+            merchandizeTotalTax: 1.5,
+            productSubTotal: 30.0,
+            productTotal: 30.0,
+            shipmentId: 'pickup1',
+            shipmentTotal: 30.0,
+            shippingAddress: {
+                address1: '100 Market St',
+                city: 'San Francisco',
+                countryCode: 'US',
+                firstName: 'Downtown Store',
+                fullName: 'Downtown Store',
+                id: 'pickup1addr',
+                lastName: 'pickup',
+                phone: '(415) 555-0001',
+                postalCode: '94105',
+                stateCode: 'CA'
+            },
+            shippingMethod: {
+                description: 'Pickup in store',
+                id: '005',
+                name: 'Store Pickup',
+                price: 0,
+                c_storePickupEnabled: true
+            },
+            shippingStatus: 'not_shipped',
+            shippingTotal: 0,
+            shippingTotalTax: 0,
+            taxTotal: 1.5,
+            c_fromStoreId: '00001'
+        },
+        {
+            adjustedMerchandizeTotalTax: 1.65,
+            adjustedShippingTotalTax: 0.3,
+            gift: false,
+            merchandizeTotalTax: 1.65,
+            productSubTotal: 32.98,
+            productTotal: 32.98,
+            shipmentId: 'delivery1',
+            shipmentTotal: 38.97,
+            shippingAddress: {
+                address1: '123 Main St',
+                city: 'Boston',
+                countryCode: 'US',
+                firstName: 'John',
+                fullName: 'John Doe',
+                id: 'delivery1addr',
+                lastName: 'Doe',
+                phone: '6175551234',
+                postalCode: '02101',
+                stateCode: 'MA'
+            },
+            shippingMethod: {
+                description: 'Order received within 7-10 business days',
+                id: '001',
+                name: 'Ground',
+                c_estimatedArrivalTime: '7-10 Business Days'
+            },
+            shippingStatus: 'not_shipped',
+            shippingTotal: 5.99,
+            shippingTotalTax: 0.3,
+            taxTotal: 1.95,
+            trackingNumber: 'TRACK123456'
+        }
+    ]
+}