From c50487ccab4ef9c2f54bddab58fbcef38c0ebb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
 <16856471+fPolic@users.noreply.github.com>
Date: Fri, 28 Feb 2025 10:15:13 +0100
Subject: [PATCH] fix(core-flows): return created order return from workflow
 (#11642)

* fix: return created order return from workflow

* fix: type

* fix: middeware export
---
 .../order/workflows/return/create-complete-return.ts |  6 +++++-
 packages/core/types/src/order/common.ts              | 12 ++++++++++++
 packages/medusa/src/api/middlewares.ts               |  2 ++
 packages/medusa/src/api/store/return/middlewares.ts  |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/core/core-flows/src/order/workflows/return/create-complete-return.ts b/packages/core/core-flows/src/order/workflows/return/create-complete-return.ts
index 5278df3bdf..9532affdfa 100644
--- a/packages/core/core-flows/src/order/workflows/return/create-complete-return.ts
+++ b/packages/core/core-flows/src/order/workflows/return/create-complete-return.ts
@@ -3,6 +3,7 @@ import {
   CreateOrderShippingMethodDTO,
   FulfillmentWorkflow,
   OrderDTO,
+  ReturnDTO,
   OrderWorkflow,
   ShippingOptionDTO,
   WithCalculatedPrice,
@@ -16,6 +17,7 @@ import {
 } from "@medusajs/framework/utils"
 import {
   WorkflowData,
+  WorkflowResponse,
   createStep,
   createWorkflow,
   parallelize,
@@ -308,7 +310,7 @@ export const createAndCompleteReturnOrderWorkflow = createWorkflow(
   createAndCompleteReturnOrderWorkflowId,
   function (
     input: WorkflowData<OrderWorkflow.CreateOrderReturnWorkflowInput>
-  ): WorkflowData<void> {
+  ): WorkflowResponse<ReturnDTO> {
     const order: OrderDTO = useRemoteQueryStep({
       entry_point: "orders",
       fields: [
@@ -412,5 +414,7 @@ export const createAndCompleteReturnOrderWorkflow = createWorkflow(
         },
       }).config({ name: "emit-return-received-event" })
     )
+
+    return new WorkflowResponse(returnCreated)
   }
 )
diff --git a/packages/core/types/src/order/common.ts b/packages/core/types/src/order/common.ts
index 5208363c40..8472137cfd 100644
--- a/packages/core/types/src/order/common.ts
+++ b/packages/core/types/src/order/common.ts
@@ -1588,6 +1588,18 @@ export interface OrderReturnItemDTO {
    */
   raw_received_quantity?: BigNumberRawValue
 
+  /**
+   * The damaged quantity of the return item.
+   */
+  damaged_quantity?: number
+
+  /**
+   * The raw damaged quantity of the return item.
+   *
+   * @ignore
+   */
+  raw_damaged_quantity?: BigNumberRawValue
+
   /**
    * Holds custom data in key-value pairs.
    */
diff --git a/packages/medusa/src/api/middlewares.ts b/packages/medusa/src/api/middlewares.ts
index 3fe4735c2a..6d07da645e 100644
--- a/packages/medusa/src/api/middlewares.ts
+++ b/packages/medusa/src/api/middlewares.ts
@@ -57,6 +57,7 @@ import { storeProductRoutesMiddlewares } from "./store/products/middlewares"
 import { storeProductTagRoutesMiddlewares } from "./store/product-tags/middlewares"
 import { storeProductTypeRoutesMiddlewares } from "./store/product-types/middlewares"
 import { storeRegionRoutesMiddlewares } from "./store/regions/middlewares"
+import { storeReturnRoutesMiddlewares } from "./store/return/middlewares"
 import { storeReturnReasonRoutesMiddlewares } from "./store/return-reasons/middlewares"
 import { storeShippingOptionRoutesMiddlewares } from "./store/shipping-options/middlewares"
 
@@ -118,6 +119,7 @@ export default defineMiddlewares([
   ...adminReturnReasonRoutesMiddlewares,
   ...adminClaimRoutesMiddlewares,
   ...adminRefundReasonsRoutesMiddlewares,
+  ...storeReturnRoutesMiddlewares,
   ...adminExchangeRoutesMiddlewares,
   ...adminProductVariantRoutesMiddlewares,
   ...adminOrderEditRoutesMiddlewares,
diff --git a/packages/medusa/src/api/store/return/middlewares.ts b/packages/medusa/src/api/store/return/middlewares.ts
index 6f5de07398..bd73cf6e52 100644
--- a/packages/medusa/src/api/store/return/middlewares.ts
+++ b/packages/medusa/src/api/store/return/middlewares.ts
@@ -6,7 +6,7 @@ import {
 import * as QueryConfig from "./query-config"
 import { ReturnsParams, StorePostReturnsReqSchema } from "./validators"
 
-export const storeRegionRoutesMiddlewares: MiddlewareRoute[] = [
+export const storeReturnRoutesMiddlewares: MiddlewareRoute[] = [
   {
     method: ["POST"],
     matcher: "/store/returns",