fix(core-flows): confirm return request (#8242)

packages/core/core-flows/src/definition/cart/utils/prepare-line-item-data.ts

@@ -43,7 +43,7 @@ export function prepareLineItemData(data: Input) {
     product_title: variant.product.title,
     product_description: variant.product.description,
     product_subtitle: variant.product.subtitle,
-    product_type: variant.product.type?.[0].value ?? null,
+    product_type: variant.product.type?.[0]?.value ?? null,
     product_collection: variant.product.collection?.[0]?.value ?? null,
     product_handle: variant.product.handle,
 

packages/core/core-flows/src/order/steps/create-return-items.ts

@@ -1,7 +1,7 @@
 import {
+  CreateOrderReturnItemDTO,
   IOrderModuleService,
   OrderChangeActionDTO,
-  UpdateReturnDTO,
 } from "@medusajs/types"
 import { ModuleRegistrationName } from "@medusajs/utils"
 import { StepResponse, createStep } from "@medusajs/workflows-sdk"
@@ -21,33 +21,24 @@ export const createReturnItemsStep = createStep(
     const returnItems = input.changes.map((item) => {
       return {
         return_id: input.returnId,
-        item_id: item.details?.reference_id,
+        item_id: item.details?.reference_id! as string,
         reason_id: item.details?.reason_id,
         quantity: item.details?.quantity as number,
         note: item.internal_note,
         metadata: (item.details?.metadata as Record<string, unknown>) ?? {},
-      }
+      } as CreateOrderReturnItemDTO
     })
-
-    const [prevReturn] = await orderModuleService.listReturns(
-      { id: input.returnId },
-      {
-        select: ["id"],
-        relations: ["items"],
-      }
+    const createdReturnItems = await orderModuleService.createReturnItems(
+      returnItems
     )
 
-    const createdReturnItems = await orderModuleService.updateReturns([
-      {
-        selector: { id: input.returnId },
-        data: { items: returnItems as UpdateReturnDTO["items"] },
-      },
-    ])
-
-    return new StepResponse(createdReturnItems, prevReturn)
+    return new StepResponse(
+      createdReturnItems,
+      createdReturnItems.map((i) => i.id)
+    )
   },
-  async (prevData, { container }) => {
-    if (!prevData) {
+  async (ids, { container }) => {
+    if (!ids) {
       return
     }
 
@@ -55,9 +46,6 @@ export const createReturnItemsStep = createStep(
       ModuleRegistrationName.ORDER
     )
 
-    await orderModuleService.updateReturns(
-      { id: prevData.id },
-      { items: prevData.items }
-    )
+    await orderModuleService.deleteReturnItems(ids)
   }
 )

packages/core/core-flows/src/order/workflows/create-fulfillment.ts

@@ -222,7 +222,7 @@ export const createOrderFulfillmentWorkflow = createWorkflow(
     })
 
     const shippingMethod = transform(order, (data) => {
-      return { data: data.shipping_methods?.[0].data }
+      return { data: data.shipping_methods?.[0]?.data }
     })
 
     const shippingOptionId = transform(order, (data) => {