diff --git a/packages/core/types/src/http/exchange/common.ts b/packages/core/types/src/http/exchange/common.ts index 6b29484ca9..31062e22d0 100644 --- a/packages/core/types/src/http/exchange/common.ts +++ b/packages/core/types/src/http/exchange/common.ts @@ -1,5 +1,5 @@ import { BaseOrder } from "../order/common"; -import { AdminBaseReturnItem, AdminReturn } from "../return"; +import { AdminReturnItem, AdminReturn } from "../return"; export interface BaseExchangeItem { id: string @@ -14,7 +14,7 @@ export interface BaseExchangeItem { export interface BaseExchange extends Omit { order_id: string - return_items: AdminBaseReturnItem[] + return_items: AdminReturnItem[] additional_items: BaseExchangeItem[] no_notification?: boolean difference_due?: number diff --git a/packages/core/types/src/http/region/admin/entities.ts b/packages/core/types/src/http/region/admin/entities.ts new file mode 100644 index 0000000000..518f82acf5 --- /dev/null +++ b/packages/core/types/src/http/region/admin/entities.ts @@ -0,0 +1,7 @@ +import { + BaseRegion, + BaseRegionCountry, +} from "../common" + +export interface AdminRegion extends BaseRegion {} +export interface AdminRegionCountry extends BaseRegionCountry {} \ No newline at end of file diff --git a/packages/core/types/src/http/region/admin/index.ts b/packages/core/types/src/http/region/admin/index.ts new file mode 100644 index 0000000000..2f1b9df166 --- /dev/null +++ b/packages/core/types/src/http/region/admin/index.ts @@ -0,0 +1,4 @@ +export * from "./entities" +export * from "./payloads" +export * from "./queries" +export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/region/admin.ts b/packages/core/types/src/http/region/admin/payloads.ts similarity index 54% rename from packages/core/types/src/http/region/admin.ts rename to packages/core/types/src/http/region/admin/payloads.ts index 17aab95b3d..b6094d5411 100644 --- a/packages/core/types/src/http/region/admin.ts +++ b/packages/core/types/src/http/region/admin/payloads.ts @@ -1,15 +1,3 @@ -import { - BaseRegion, - BaseRegionCountry, - BaseRegionCountryFilters, - BaseRegionFilters, -} from "./common" - -export interface AdminRegion extends BaseRegion {} -export interface AdminRegionCountry extends BaseRegionCountry {} -export interface AdminRegionFilters extends BaseRegionFilters {} -export interface AdminRegionCountryFilters extends BaseRegionCountryFilters {} - export interface AdminCreateRegion { name: string currency_code: string diff --git a/packages/core/types/src/http/region/admin/queries.ts b/packages/core/types/src/http/region/admin/queries.ts new file mode 100644 index 0000000000..db57198d76 --- /dev/null +++ b/packages/core/types/src/http/region/admin/queries.ts @@ -0,0 +1,7 @@ +import { + BaseRegionCountryFilters, + BaseRegionFilters, +} from "../common" + +export interface AdminRegionFilters extends BaseRegionFilters {} +export interface AdminRegionCountryFilters extends BaseRegionCountryFilters {} \ No newline at end of file diff --git a/packages/core/types/src/http/region/admin/responses.ts b/packages/core/types/src/http/region/admin/responses.ts new file mode 100644 index 0000000000..5938bd3d1a --- /dev/null +++ b/packages/core/types/src/http/region/admin/responses.ts @@ -0,0 +1,10 @@ +import { PaginatedResponse } from "../../common"; +import { AdminRegion } from "./entities"; + +export interface AdminRegionResponse { + region: AdminRegion +} + +export type AdminRegionListResponse = PaginatedResponse<{ + regions: AdminRegion[] +}> \ No newline at end of file diff --git a/packages/core/types/src/http/reservation/admin/reservation.ts b/packages/core/types/src/http/reservation/admin/entities.ts similarity index 60% rename from packages/core/types/src/http/reservation/admin/reservation.ts rename to packages/core/types/src/http/reservation/admin/entities.ts index b028d33bc6..76776ac048 100644 --- a/packages/core/types/src/http/reservation/admin/reservation.ts +++ b/packages/core/types/src/http/reservation/admin/entities.ts @@ -1,6 +1,4 @@ -import { PaginatedResponse } from "../../common" - -interface ReservationResponse { +export interface ReservationResponse { id: string line_item_id: string | null location_id: string @@ -14,12 +12,4 @@ interface ReservationResponse { deleted_at?: Date | string | null created_at?: Date | string updated_at?: Date | string -} - -export interface AdminReservationResponse { - reservation: ReservationResponse -} - -export type AdminReservationListResponse = PaginatedResponse<{ - reservations: ReservationResponse[] -}> +} \ No newline at end of file diff --git a/packages/core/types/src/http/reservation/admin/index.ts b/packages/core/types/src/http/reservation/admin/index.ts index aabdab920a..e6c04bce7f 100644 --- a/packages/core/types/src/http/reservation/admin/index.ts +++ b/packages/core/types/src/http/reservation/admin/index.ts @@ -1 +1,2 @@ -export * from "./reservation" +export * from "./entities" +export * from "./responses" diff --git a/packages/core/types/src/http/reservation/admin/responses.ts b/packages/core/types/src/http/reservation/admin/responses.ts new file mode 100644 index 0000000000..11d4e02975 --- /dev/null +++ b/packages/core/types/src/http/reservation/admin/responses.ts @@ -0,0 +1,10 @@ +import { PaginatedResponse } from "../../common" +import { ReservationResponse } from "./entities" + +export interface AdminReservationResponse { + reservation: ReservationResponse +} + +export type AdminReservationListResponse = PaginatedResponse<{ + reservations: ReservationResponse[] +}> diff --git a/packages/core/types/src/http/return/admin/entities.ts b/packages/core/types/src/http/return/admin/entities.ts new file mode 100644 index 0000000000..b0e0189a13 --- /dev/null +++ b/packages/core/types/src/http/return/admin/entities.ts @@ -0,0 +1,4 @@ +import { BaseReturn, BaseReturnItem } from "../common"; + +export interface AdminReturnItem extends BaseReturnItem {} +export interface AdminReturn extends BaseReturn {} \ No newline at end of file diff --git a/packages/core/types/src/http/return/admin/index.ts b/packages/core/types/src/http/return/admin/index.ts new file mode 100644 index 0000000000..2f1b9df166 --- /dev/null +++ b/packages/core/types/src/http/return/admin/index.ts @@ -0,0 +1,4 @@ +export * from "./entities" +export * from "./payloads" +export * from "./queries" +export * from "./responses" \ No newline at end of file diff --git a/packages/core/types/src/http/return/admin.ts b/packages/core/types/src/http/return/admin/payloads.ts similarity index 62% rename from packages/core/types/src/http/return/admin.ts rename to packages/core/types/src/http/return/admin/payloads.ts index c766025e6c..6a5ca97d83 100644 --- a/packages/core/types/src/http/return/admin.ts +++ b/packages/core/types/src/http/return/admin/payloads.ts @@ -1,39 +1,3 @@ -import { OperatorMap } from "../../dal" -import { FindParams } from "../common" - -export interface AdminBaseReturnItem { - id: string - quantity: number - received_quantity: number - reason_id?: string - note?: string - item_id: string - return_id: string - metadata?: Record -} - -export interface AdminReturn { - id: string - order_id: string - status?: string - exchange_id?: string - location_id?: string - claim_id?: string - order_version: number - display_id: number - no_notification?: boolean - refund_amount?: number - items: AdminBaseReturnItem[] -} - -export interface AdminReturnResponse { - return: AdminReturn -} - -export interface AdminReturnsResponse { - returns: AdminReturn[] -} - export interface AdminInitiateReturnRequest { order_id: string location_id?: string @@ -115,16 +79,4 @@ export interface AdminUpdateDismissItems { internal_note?: string reason_id?: string metadata?: Record -} - -export interface AdminReturnFilters extends FindParams { - id?: string[] | string | OperatorMap - order_id?: string[] | string | OperatorMap - status?: - | string[] - | string - | Record - | OperatorMap> - created_at?: OperatorMap - updated_at?: OperatorMap -} +} \ No newline at end of file diff --git a/packages/core/types/src/http/return/admin/queries.ts b/packages/core/types/src/http/return/admin/queries.ts new file mode 100644 index 0000000000..539ed58c0b --- /dev/null +++ b/packages/core/types/src/http/return/admin/queries.ts @@ -0,0 +1,14 @@ +import { OperatorMap } from "../../../dal" +import { FindParams } from "../../common" + +export interface AdminReturnFilters extends FindParams { + id?: string[] | string | OperatorMap + order_id?: string[] | string | OperatorMap + status?: + | string[] + | string + | Record + | OperatorMap> + created_at?: OperatorMap + updated_at?: OperatorMap +} diff --git a/packages/core/types/src/http/return/admin/responses.ts b/packages/core/types/src/http/return/admin/responses.ts new file mode 100644 index 0000000000..5c30302ea9 --- /dev/null +++ b/packages/core/types/src/http/return/admin/responses.ts @@ -0,0 +1,22 @@ +import { OrderDTO } from "../../../order" +import { PaginatedResponse } from "../../common" +import { AdminOrderPreview } from "../../order" +import { AdminReturn } from "./entities" + +export interface AdminReturnResponse { + return: AdminReturn +} + +export type AdminReturnsResponse = PaginatedResponse<{ + returns: AdminReturn[] +}> + +export interface AdminOrderReturnResponse { + order: OrderDTO + return: AdminReturn +} + +export interface AdminReturnPreviewResponse { + order_preview: AdminOrderPreview + return: AdminReturn +} \ No newline at end of file diff --git a/packages/medusa/src/api/admin/regions/[id]/route.ts b/packages/medusa/src/api/admin/regions/[id]/route.ts index 1a39eb782e..2188cd5df1 100644 --- a/packages/medusa/src/api/admin/regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/regions/[id]/route.ts @@ -9,10 +9,11 @@ import { } from "../../../../types/routing" import { refetchRegion } from "../helpers" import { AdminGetRegionParamsType, AdminUpdateRegionType } from "../validators" +import { DeleteResponse, HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const region = await refetchRegion( req.params.id, @@ -32,7 +33,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { result } = await updateRegionsWorkflow(req.scope).run({ input: { @@ -52,7 +53,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse> ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/regions/route.ts b/packages/medusa/src/api/admin/regions/route.ts index 53407c1aa1..3d4c086f0b 100644 --- a/packages/medusa/src/api/admin/regions/route.ts +++ b/packages/medusa/src/api/admin/regions/route.ts @@ -9,10 +9,11 @@ import { } from "@medusajs/utils" import { AdminCreateRegionType, AdminGetRegionsParamsType } from "./validators" import { refetchRegion } from "./helpers" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -37,7 +38,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/reservations/[id]/route.ts b/packages/medusa/src/api/admin/reservations/[id]/route.ts index afbecd3154..263c54d084 100644 --- a/packages/medusa/src/api/admin/reservations/[id]/route.ts +++ b/packages/medusa/src/api/admin/reservations/[id]/route.ts @@ -10,10 +10,11 @@ import { MedusaError } from "@medusajs/utils" import { deleteReservationsWorkflow } from "@medusajs/core-flows" import { updateReservationsWorkflow } from "@medusajs/core-flows" import { refetchReservation } from "../helpers" +import { DeleteResponse, HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -35,7 +36,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params await updateReservationsWorkflow(req.scope).run({ @@ -54,7 +55,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse> ) => { const id = req.params.id diff --git a/packages/medusa/src/api/admin/reservations/route.ts b/packages/medusa/src/api/admin/reservations/route.ts index 74cb1a01d1..782f08b576 100644 --- a/packages/medusa/src/api/admin/reservations/route.ts +++ b/packages/medusa/src/api/admin/reservations/route.ts @@ -13,10 +13,11 @@ import { AdminGetReservationsParamsType, } from "./validators" import { refetchReservation } from "./helpers" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -41,7 +42,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const input = [req.validatedBody] diff --git a/packages/medusa/src/api/admin/return-reasons/[id]/route.ts b/packages/medusa/src/api/admin/return-reasons/[id]/route.ts index f748bc8041..0db7cb221c 100644 --- a/packages/medusa/src/api/admin/return-reasons/[id]/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/[id]/route.ts @@ -4,6 +4,7 @@ import { } from "@medusajs/core-flows" import { AdminReturnReasonResponse, + DeleteResponse, UpdateOrderReturnReasonDTO, } from "@medusajs/types" import { @@ -40,7 +41,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const workflow = updateReturnReasonsWorkflow(req.scope) @@ -68,7 +69,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse> ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/return-reasons/route.ts b/packages/medusa/src/api/admin/return-reasons/route.ts index 9ca43def46..b60c791a4e 100644 --- a/packages/medusa/src/api/admin/return-reasons/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/route.ts @@ -1,5 +1,5 @@ import { createReturnReasonsWorkflow } from "@medusajs/core-flows" -import { CreateOrderReturnReasonDTO } from "@medusajs/types" +import { CreateOrderReturnReasonDTO, HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, @@ -12,7 +12,7 @@ import { AdminGetReturnReasonsParamsType } from "./validators" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const queryObject = remoteQueryObjectFromString({ @@ -38,7 +38,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const workflow = createReturnReasonsWorkflow(req.scope) diff --git a/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts b/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts index 5c916844b2..507ec9b7a0 100644 --- a/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts @@ -4,10 +4,11 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostCancelReturnReqSchemaType } from "../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -19,5 +20,5 @@ export const POST = async ( }, }) - res.status(200).json({ return: result }) + res.status(200).json({ return: result as HttpTypes.AdminReturn }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts index a8e09f16fa..375afccc00 100644 --- a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts @@ -11,10 +11,11 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsDismissItemsActionReqSchemaType } from "../../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id, action_id } = req.params @@ -44,14 +45,14 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -79,7 +80,7 @@ export const DELETE = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: orderPreview, + order_preview: orderPreview as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts index 716b741b5a..df1e087d03 100644 --- a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts @@ -8,10 +8,11 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsReceiveItemsReqSchemaType } from "../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -35,7 +36,7 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts index f99cb2f3de..7d2223bcf6 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts @@ -11,10 +11,11 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsReceiveItemsActionReqSchemaType } from "../../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id, action_id } = req.params @@ -44,14 +45,14 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -79,7 +80,7 @@ export const DELETE = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: orderPreview, + order_preview: orderPreview as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts index 296381910b..48c49d1780 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts @@ -8,10 +8,11 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsReceiveItemsReqSchemaType } from "../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -35,7 +36,7 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts index 478470d01c..706a74178b 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts @@ -8,10 +8,11 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsConfirmRequestReqSchemaType } from "../../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -35,7 +36,7 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts index 57a1821602..26f55c2998 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts @@ -13,10 +13,11 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReceiveReturnsReqSchemaType } from "../../validators" +import { DeleteResponse, HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) const orderModuleService = req.scope.resolve(ModuleRegistrationName.ORDER) @@ -55,7 +56,7 @@ export const POST = async ( export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse> ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts index 4ebf1d7710..1ca8d97cbc 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts @@ -11,10 +11,11 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsRequestItemsActionReqSchemaType } from "../../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id, action_id } = req.params @@ -42,14 +43,14 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -77,7 +78,7 @@ export const DELETE = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: orderPreview, + order_preview: orderPreview as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts index 13119989a0..2c894e8a15 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts @@ -8,10 +8,11 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsRequestItemsReqSchemaType } from "../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -35,7 +36,7 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/request/route.ts b/packages/medusa/src/api/admin/returns/[id]/request/route.ts index a24123a075..c58336e48f 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request/route.ts @@ -11,10 +11,11 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsConfirmRequestReqSchemaType } from "../../validators" +import { DeleteResponse, HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -38,14 +39,14 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse> ) => { const { id } = req.params diff --git a/packages/medusa/src/api/admin/returns/[id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/route.ts index 9822acd9d1..c948e55de1 100644 --- a/packages/medusa/src/api/admin/returns/[id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/route.ts @@ -8,10 +8,11 @@ import { MedusaResponse, } from "../../../../types/routing" import { AdminPostReturnsReturnReqSchemaType } from "../validators" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -39,7 +40,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -63,7 +64,7 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts index 1f3c2a452c..549c1151d6 100644 --- a/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts @@ -11,10 +11,11 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsShippingActionReqSchemaType } from "../../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id, action_id } = req.params @@ -42,14 +43,14 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } export const DELETE = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -77,7 +78,7 @@ export const DELETE = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: orderPreview, + order_preview: orderPreview as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts b/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts index 783a7fd2b1..56531656d4 100644 --- a/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts @@ -8,10 +8,11 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsShippingReqSchemaType } from "../../validators" +import { HttpTypes } from "@medusajs/types" export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const { id } = req.params @@ -35,7 +36,7 @@ export const POST = async ( const [orderReturn] = await remoteQuery(queryObject) res.json({ - order_preview: result, + order_preview: result as unknown as HttpTypes.AdminOrderPreview, return: orderReturn, }) } diff --git a/packages/medusa/src/api/admin/returns/route.ts b/packages/medusa/src/api/admin/returns/route.ts index b67019517d..34eb1b62c5 100644 --- a/packages/medusa/src/api/admin/returns/route.ts +++ b/packages/medusa/src/api/admin/returns/route.ts @@ -10,10 +10,11 @@ import { MedusaResponse, } from "../../../types/routing" import { AdminPostReturnsReqSchemaType } from "./validators" +import { HttpTypes } from "@medusajs/types" export const GET = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) @@ -40,7 +41,7 @@ export const GET = async ( export const POST = async ( req: AuthenticatedMedusaRequest, - res: MedusaResponse + res: MedusaResponse ) => { const input = req.validatedBody as AdminPostReturnsReqSchemaType const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY)