rename variable

rename variable

Author: sf-deepali-bharmal

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

@@ -5,6 +5,7 @@
   - Integrate Order Details page to display orders data from OMS [#3573](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3573)
   - Integrate Order History page to display data from OMS [#3581](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3581)
   - Add shipping display support for OMS [#3588](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3588)
+  - BOPIS multishipment with OMS [#3613] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3613)
 - [Feature] Update passwordless login and password reset to use email mode by default. The mode can now be configured across the login page, auth modal, and checkout page [#3525](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3525)
 - Update "Continue Securely" button text to "Continue" for passwordless login [#3556](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3556)
 

packages/template-retail-react-app/app/pages/account/order-detail.jsx

@@ -137,11 +137,9 @@ const AccountOrderDetail = () => {
     // Check if order has OMS data
     const isOmsOrder = useMemo(() => !!order?.omsData, [order?.omsData])
 
-    // Check if order is OMS multi-shipment order
-    const isOmsMultiShipment = useMemo(
-        () =>
-            isOmsOrder &&
-            ((order?.omsData?.shipments?.length ?? 0) > 1 || (order?.shipments?.length ?? 0) > 1),
+    // Check if order is multi-shipment order
+    const isMultiShipmentOrder = useMemo(
+        () => (order?.omsData?.shipments?.length ?? 0) > 1 || (order?.shipments?.length ?? 0) > 1,
         [isOmsOrder, order?.omsData?.shipments?.length, order?.shipments?.length]
     )
 
@@ -397,8 +395,8 @@ const AccountOrderDetail = () => {
                                         </Stack>
                                     )
                                 })}
-                                {/* Delivery Shipments */}
-                                {!isOmsMultiShipment &&
+                                {/* Any type of Non-OMS or any type of single shipment order: show DeliveryMethods and Shipments info*/}
+                                {(!isOmsOrder || !isMultiShipmentOrder) &&
                                     deliveryShipments.map((shipment, index) => {
                                         const omsShipment = isOmsOrder
                                             ? order.omsData.shipments?.[index]
@@ -458,8 +456,9 @@ const AccountOrderDetail = () => {
                                         )
                                     })}
 
-                                {/* OMS multi-shipment: show OMS shipment info only;*/}
-                                {isOmsMultiShipment &&
+                                {/* Any OMS multi-shipment: Only show OMS Shipments info;*/}
+                                {isOmsOrder &&
+                                    isMultiShipmentOrder &&
                                     order?.omsData?.shipments?.map((shipment, index) => (
                                         <React.Fragment key={`oms-shipment-${index}`}>
                                             {renderShippingMethod(