feat(core-flows): request return on order exchanges and claims (#8107)

FIXES: CC-92, CC-87

packages/modules/order/src/services/order-module-service.ts

@@ -1932,9 +1932,28 @@ export default class OrderModuleService<
     return await this.orderChangeService_.create(input, sharedContext)
   }
 
-  async previewOrderChange(orderChangeId: string, sharedContext?: Context) {
+  @InjectManager("baseRepository_")
+  async previewOrderChange(orderId: string, sharedContext?: Context) {
+    const order = await this.retrieveOrder(
+      orderId,
+      {
+        select: ["id", "version", "items.detail", "summary", "total"],
+        relations: [
+          "transactions",
+          "items",
+          "items.detail",
+          "shipping_methods",
+        ],
+      },
+      sharedContext
+    )
+
+    if (!order.order_change) {
+      return order
+    }
+
     const orderChange = await super.retrieveOrderChange(
-      orderChangeId,
+      order.order_change.id,
       { relations: ["actions"] },
       sharedContext
     )
@@ -1950,20 +1969,6 @@ export default class OrderModuleService<
       }
     })
 
-    const order = await this.retrieveOrder(
-      orderChange.order_id,
-      {
-        select: ["id", "version", "items.detail", "summary", "total"],
-        relations: [
-          "transactions",
-          "items",
-          "items.detail",
-          "shipping_methods",
-        ],
-      },
-      sharedContext
-    )
-
     const calculated = calculateOrderChange({
       order: order as any,
       actions: orderChange.actions,

packages/modules/order/src/utils/transform-order.ts

@@ -97,7 +97,7 @@ function cleanNestedRelations(obj) {
 }
 
 function formatOrderReturn(orderReturn, mainOrder) {
-  orderReturn.items.forEach((orderItem) => {
+  orderReturn.items?.forEach((orderItem) => {
     const item = mainOrder.items?.find((item) => item.id === orderItem.item_id)
 
     orderItem.detail = item?.detail