diff --git a/packages/core/core-flows/src/order/workflows/claim/claim-add-new-item.ts b/packages/core/core-flows/src/order/workflows/claim/claim-add-new-item.ts index b4419a231c..3761cd591d 100644 --- a/packages/core/core-flows/src/order/workflows/claim/claim-add-new-item.ts +++ b/packages/core/core-flows/src/order/workflows/claim/claim-add-new-item.ts @@ -2,6 +2,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -49,7 +50,7 @@ export const orderClaimAddNewItemWorkflow = createWorkflow( orderClaimAddNewItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/claim-item.ts b/packages/core/core-flows/src/order/workflows/claim/claim-item.ts index f409ba74b2..08fd6cbd3d 100644 --- a/packages/core/core-flows/src/order/workflows/claim/claim-item.ts +++ b/packages/core/core-flows/src/order/workflows/claim/claim-item.ts @@ -2,6 +2,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -48,7 +49,7 @@ export const orderClaimItemWorkflow = createWorkflow( orderClaimItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts b/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts index 64ff8ec34b..71f71f35f4 100644 --- a/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts +++ b/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts @@ -2,6 +2,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -60,7 +61,7 @@ export const orderClaimRequestItemReturnWorkflow = createWorkflow( orderClaimRequestItemReturnWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "order_id", "return_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts b/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts index 4d3f91160d..9557fa4485 100644 --- a/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts +++ b/packages/core/core-flows/src/order/workflows/claim/confirm-claim-request.ts @@ -4,6 +4,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, } from "@medusajs/types" import { ChangeActionType, @@ -183,7 +184,7 @@ export const confirmClaimRequestWorkflow = createWorkflow( confirmClaimRequestWorkflowId, function ( input: ConfirmClaimRequestWorkflowInput - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/create-claim-shipping-method.ts b/packages/core/core-flows/src/order/workflows/claim/create-claim-shipping-method.ts index ec25aff921..722ea8457d 100644 --- a/packages/core/core-flows/src/order/workflows/claim/create-claim-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/claim/create-claim-shipping-method.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" import { @@ -52,7 +53,7 @@ export const createClaimShippingMethodWorkflow = createWorkflow( claim_id?: string shipping_option_id: string custom_price?: BigNumberInput - }): WorkflowResponse { + }): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/remove-claim-add-item-action.ts b/packages/core/core-flows/src/order/workflows/claim/remove-claim-add-item-action.ts index 17181f91c5..ff11650cab 100644 --- a/packages/core/core-flows/src/order/workflows/claim/remove-claim-add-item-action.ts +++ b/packages/core/core-flows/src/order/workflows/claim/remove-claim-add-item-action.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -64,7 +65,7 @@ export const removeAddItemClaimActionWorkflow = createWorkflow( removeAddItemClaimActionWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], @@ -94,7 +95,12 @@ export const removeAddItemClaimActionWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - removeClaimAddItemActionValidationStep({ order, input, orderClaim, orderChange }) + removeClaimAddItemActionValidationStep({ + order, + input, + orderClaim, + orderChange, + }) deleteOrderChangeActionsStep({ ids: [input.action_id] }) diff --git a/packages/core/core-flows/src/order/workflows/claim/remove-claim-item-action.ts b/packages/core/core-flows/src/order/workflows/claim/remove-claim-item-action.ts index 7432ab80b8..097c2f5300 100644 --- a/packages/core/core-flows/src/order/workflows/claim/remove-claim-item-action.ts +++ b/packages/core/core-flows/src/order/workflows/claim/remove-claim-item-action.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -64,7 +65,7 @@ export const removeItemClaimActionWorkflow = createWorkflow( removeItemClaimActionWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], @@ -94,7 +95,12 @@ export const removeItemClaimActionWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - removeClaimItemActionValidationStep({ order, input, orderClaim, orderChange }) + removeClaimItemActionValidationStep({ + order, + input, + orderClaim, + orderChange, + }) deleteOrderChangeActionsStep({ ids: [input.action_id] }) diff --git a/packages/core/core-flows/src/order/workflows/claim/remove-claim-shipping-method.ts b/packages/core/core-flows/src/order/workflows/claim/remove-claim-shipping-method.ts index 5658e0a5dd..d986d9bd54 100644 --- a/packages/core/core-flows/src/order/workflows/claim/remove-claim-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/claim/remove-claim-shipping-method.ts @@ -2,7 +2,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderClaimDTO, - OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -65,7 +65,7 @@ export const removeClaimShippingMethodWorkflow = createWorkflow( removeClaimShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/update-claim-add-item.ts b/packages/core/core-flows/src/order/workflows/claim/update-claim-add-item.ts index 0fef60d07c..7d09af9136 100644 --- a/packages/core/core-flows/src/order/workflows/claim/update-claim-add-item.ts +++ b/packages/core/core-flows/src/order/workflows/claim/update-claim-add-item.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -68,7 +69,7 @@ export const updateClaimAddItemWorkflow = createWorkflow( updateClaimAddItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/update-claim-item.ts b/packages/core/core-flows/src/order/workflows/claim/update-claim-item.ts index fd96189222..175b4f2aca 100644 --- a/packages/core/core-flows/src/order/workflows/claim/update-claim-item.ts +++ b/packages/core/core-flows/src/order/workflows/claim/update-claim-item.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderClaimDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -68,7 +69,7 @@ export const updateClaimItemWorkflow = createWorkflow( updateClaimItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/claim/update-claim-shipping-method.ts b/packages/core/core-flows/src/order/workflows/claim/update-claim-shipping-method.ts index 0af5034ee3..0d8e08b78a 100644 --- a/packages/core/core-flows/src/order/workflows/claim/update-claim-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/claim/update-claim-shipping-method.ts @@ -2,7 +2,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderClaimDTO, - OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -67,7 +67,7 @@ export const updateClaimShippingMethodWorkflow = createWorkflow( updateClaimShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderClaim: OrderClaimDTO = useRemoteQueryStep({ entry_point: "order_claim", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts b/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts index 0eae43d5c4..7e3acd8be9 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/confirm-exchange-request.ts @@ -4,6 +4,7 @@ import { OrderChangeDTO, OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, } from "@medusajs/types" import { ChangeActionType, Modules, OrderChangeStatus } from "@medusajs/utils" import { @@ -173,7 +174,9 @@ export const confirmExchangeRequestWorkflowId = "confirm-exchange-request" */ export const confirmExchangeRequestWorkflow = createWorkflow( confirmExchangeRequestWorkflowId, - function (input: ConfirmExchangeRequestWorkflowInput): WorkflowResponse { + function ( + input: ConfirmExchangeRequestWorkflowInput + ): WorkflowResponse { const orderExchange: OrderExchangeDTO = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/exchange/create-exchange-shipping-method.ts b/packages/core/core-flows/src/order/workflows/exchange/create-exchange-shipping-method.ts index 3974bbd0da..e2c1ec6faa 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/create-exchange-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/create-exchange-shipping-method.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" import { @@ -52,7 +53,7 @@ export const createExchangeShippingMethodWorkflow = createWorkflow( exchange_id?: string shipping_option_id: string custom_price?: BigNumberInput - }): WorkflowResponse { + }): WorkflowResponse { const orderExchange: OrderExchangeDTO = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/exchange/exchange-add-new-item.ts b/packages/core/core-flows/src/order/workflows/exchange/exchange-add-new-item.ts index a329e7181b..eaa9e797e4 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/exchange-add-new-item.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/exchange-add-new-item.ts @@ -2,6 +2,7 @@ import { OrderChangeDTO, OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -49,7 +50,7 @@ export const orderExchangeAddNewItemWorkflow = createWorkflow( orderExchangeAddNewItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderExchange = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts b/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts index 1d8e3447cd..20ab95534b 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts @@ -2,6 +2,7 @@ import { OrderChangeDTO, OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -60,7 +61,7 @@ export const orderExchangeRequestItemReturnWorkflow = createWorkflow( orderExchangeRequestItemReturnWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderExchange = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "order_id", "return_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-item-action.ts b/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-item-action.ts index fce5c73387..028f826e16 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-item-action.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-item-action.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -64,7 +65,7 @@ export const removeItemExchangeActionWorkflow = createWorkflow( removeItemExchangeActionWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderExchange: OrderExchangeDTO = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "status", "order_id", "canceled_at"], @@ -94,7 +95,12 @@ export const removeItemExchangeActionWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - removeExchangeItemActionValidationStep({ order, input, orderExchange, orderChange }) + removeExchangeItemActionValidationStep({ + order, + input, + orderExchange, + orderChange, + }) deleteOrderChangeActionsStep({ ids: [input.action_id] }) diff --git a/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-shipping-method.ts b/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-shipping-method.ts index 6039a9445d..2f7389bfc8 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/remove-exchange-shipping-method.ts @@ -1,8 +1,8 @@ import { OrderChangeActionDTO, OrderChangeDTO, - OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -65,7 +65,7 @@ export const removeExchangeShippingMethodWorkflow = createWorkflow( removeExchangeShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderExchange: OrderExchangeDTO = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "status", "order_id", "canceled_at"], @@ -87,7 +87,11 @@ export const removeExchangeShippingMethodWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - removeExchangeShippingMethodValidationStep({ orderExchange, orderChange, input }) + removeExchangeShippingMethodValidationStep({ + orderExchange, + orderChange, + input, + }) const dataToRemove = transform( { orderChange, input }, diff --git a/packages/core/core-flows/src/order/workflows/exchange/update-exchange-add-item.ts b/packages/core/core-flows/src/order/workflows/exchange/update-exchange-add-item.ts index 6f9571d536..d262c718e9 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/update-exchange-add-item.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/update-exchange-add-item.ts @@ -3,6 +3,7 @@ import { OrderChangeDTO, OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -68,7 +69,7 @@ export const updateExchangeAddItemWorkflow = createWorkflow( updateExchangeAddItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderExchange: OrderExchangeDTO = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "status", "order_id", "canceled_at"], @@ -98,7 +99,12 @@ export const updateExchangeAddItemWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - updateExchangeAddItemValidationStep({ order, input, orderExchange, orderChange }) + updateExchangeAddItemValidationStep({ + order, + input, + orderExchange, + orderChange, + }) const updateData = transform( { orderChange, input }, diff --git a/packages/core/core-flows/src/order/workflows/exchange/update-exchange-shipping-method.ts b/packages/core/core-flows/src/order/workflows/exchange/update-exchange-shipping-method.ts index d70ed467ec..551ee3fb18 100644 --- a/packages/core/core-flows/src/order/workflows/exchange/update-exchange-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/exchange/update-exchange-shipping-method.ts @@ -1,8 +1,8 @@ import { OrderChangeActionDTO, OrderChangeDTO, - OrderDTO, OrderExchangeDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -67,7 +67,7 @@ export const updateExchangeShippingMethodWorkflow = createWorkflow( updateExchangeShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderExchange: OrderExchangeDTO = useRemoteQueryStep({ entry_point: "order_exchange", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/index.ts b/packages/core/core-flows/src/order/workflows/index.ts index 448870211c..43192d7bfb 100644 --- a/packages/core/core-flows/src/order/workflows/index.ts +++ b/packages/core/core-flows/src/order/workflows/index.ts @@ -39,6 +39,15 @@ export * from "./exchange/update-exchange-add-item" export * from "./exchange/update-exchange-shipping-method" export * from "./get-order-detail" export * from "./get-orders-list" +export * from "./order-edit/begin-order-edit" +export * from "./order-edit/cancel-begin-order-edit" +export * from "./order-edit/confirm-order-edit-request" +export * from "./order-edit/create-order-edit-shipping-method" +export * from "./order-edit/order-edit-add-new-item" +export * from "./order-edit/remove-order-edit-item-action" +export * from "./order-edit/remove-order-edit-shipping-method" +export * from "./order-edit/update-order-edit-add-item" +export * from "./order-edit/update-order-edit-shipping-method" export * from "./return/begin-receive-return" export * from "./return/begin-return" export * from "./return/cancel-receive-return" diff --git a/packages/core/core-flows/src/order/workflows/order-edit/begin-order-edit.ts b/packages/core/core-flows/src/order/workflows/order-edit/begin-order-edit.ts index 280481a682..00d7d6ce47 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/begin-order-edit.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/begin-order-edit.ts @@ -13,7 +13,7 @@ import { throwIfOrderIsCancelled } from "../../utils/order-validation" /** * This step validates that an order-edit can be requested for an order. */ -export const beginOrderOrderEditValidationStep = createStep( +export const beginorderEditValidationStep = createStep( "begin-order-edit-validation", async function ({ order }: { order: OrderDTO }) { throwIfOrderIsCancelled({ order }) @@ -27,7 +27,7 @@ export const beginOrderEditOrderWorkflowId = "begin-order-edit-order" export const beginOrderEditOrderWorkflow = createWorkflow( beginOrderEditOrderWorkflowId, function ( - input: WorkflowData + input: WorkflowData ): WorkflowResponse { const order: OrderDTO = useRemoteQueryStep({ entry_point: "orders", @@ -37,7 +37,7 @@ export const beginOrderEditOrderWorkflow = createWorkflow( throw_if_key_not_found: true, }) - beginOrderOrderEditValidationStep({ order }) + beginorderEditValidationStep({ order }) const orderChangeInput = transform({ input }, ({ input }) => { return { diff --git a/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts b/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts index 238b9a38f9..04a34c22d9 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts @@ -1,4 +1,4 @@ -import { OrderChangeDTO, OrderDTO } from "@medusajs/types" +import { OrderChangeDTO, OrderDTO, OrderPreviewDTO } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" import { WorkflowResponse, @@ -45,7 +45,7 @@ export const confirmOrderEditRequestWorkflow = createWorkflow( confirmOrderEditRequestWorkflowId, function ( input: ConfirmOrderEditRequestWorkflowInput - ): WorkflowResponse { + ): WorkflowResponse { const order: OrderDTO = useRemoteQueryStep({ entry_point: "orders", fields: [ @@ -117,7 +117,7 @@ export const confirmOrderEditRequestWorkflow = createWorkflow( variables: { id: input.order_id }, list: false, throw_if_key_not_found: true, - }).config({ name: "order-query" }) + }).config({ name: "order-items-query" }) const { variants, items } = transform({ orderItems }, ({ orderItems }) => { const allItems: any[] = [] diff --git a/packages/core/core-flows/src/order/workflows/order-edit/create-order-edit-shipping-method.ts b/packages/core/core-flows/src/order/workflows/order-edit/create-order-edit-shipping-method.ts index b7611b00d1..cb54f239a1 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/create-order-edit-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/create-order-edit-shipping-method.ts @@ -1,4 +1,9 @@ -import { BigNumberInput, OrderChangeDTO, OrderDTO } from "@medusajs/types" +import { + BigNumberInput, + OrderChangeDTO, + OrderDTO, + OrderPreviewDTO, +} from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" import { WorkflowResponse, @@ -43,7 +48,7 @@ export const createOrderEditShippingMethodWorkflow = createWorkflow( order_id: string shipping_option_id: string custom_price?: BigNumberInput - }): WorkflowResponse { + }): WorkflowResponse { const order: OrderDTO = useRemoteQueryStep({ entry_point: "orders", fields: ["id", "status", "currency_code", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/order-edit/order-edit-add-new-item.ts b/packages/core/core-flows/src/order/workflows/order-edit/order-edit-add-new-item.ts index fb9495f2e1..a9a2820558 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/order-edit-add-new-item.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/order-edit-add-new-item.ts @@ -1,4 +1,9 @@ -import { OrderChangeDTO, OrderDTO, OrderWorkflow } from "@medusajs/types" +import { + OrderChangeDTO, + OrderDTO, + OrderPreviewDTO, + OrderWorkflow, +} from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" import { WorkflowData, @@ -33,15 +38,15 @@ export const orderEditAddNewItemValidationStep = createStep( } ) -export const orderOrderEditAddNewItemWorkflowId = "order-edit-add-new-item" +export const orderEditAddNewItemWorkflowId = "order-edit-add-new-item" /** * This workflow adds new items to an order edit. */ -export const orderOrderEditAddNewItemWorkflow = createWorkflow( - orderOrderEditAddNewItemWorkflowId, +export const orderEditAddNewItemWorkflow = createWorkflow( + orderEditAddNewItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const order: OrderDTO = useRemoteQueryStep({ entry_point: "orders", fields: ["id", "status", "canceled_at", "items.*"], diff --git a/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-item-action.ts b/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-item-action.ts index beaa2113d0..f808d4857a 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-item-action.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-item-action.ts @@ -2,6 +2,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -61,7 +62,7 @@ export const removeItemOrderEditActionWorkflow = createWorkflow( removeItemOrderEditActionWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const order: OrderDTO = useRemoteQueryStep({ entry_point: "orders", fields: ["id", "status", "canceled_at", "items.*"], diff --git a/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-shipping-method.ts b/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-shipping-method.ts index e303626589..54677e89a5 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/remove-order-edit-shipping-method.ts @@ -1,7 +1,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, - OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -58,7 +58,7 @@ export const removeOrderEditShippingMethodWorkflow = createWorkflow( removeOrderEditShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderChange: OrderChangeDTO = useRemoteQueryStep({ entry_point: "order_change", fields: ["id", "status", "version", "actions.*"], diff --git a/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-add-item.ts b/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-add-item.ts index 6cb81c839d..a406ccab1b 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-add-item.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-add-item.ts @@ -2,6 +2,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -64,7 +65,7 @@ export const updateOrderEditAddItemWorkflow = createWorkflow( updateOrderEditAddItemWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const order: OrderDTO = useRemoteQueryStep({ entry_point: "orders", fields: ["id", "status", "canceled_at", "items.*"], diff --git a/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-shipping-method.ts b/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-shipping-method.ts index 515a348da3..aee28a81ba 100644 --- a/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-shipping-method.ts @@ -1,7 +1,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, - OrderDTO, + OrderPreviewDTO, OrderWorkflow, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -60,7 +60,7 @@ export const updateOrderEditShippingMethodWorkflow = createWorkflow( updateOrderEditShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderChange: OrderChangeDTO = useRemoteQueryStep({ entry_point: "order_change", fields: ["id", "status", "version", "actions.*"], diff --git a/packages/core/core-flows/src/order/workflows/return/confirm-receive-return-request.ts b/packages/core/core-flows/src/order/workflows/return/confirm-receive-return-request.ts index 8fddf29552..3cd4f62021 100644 --- a/packages/core/core-flows/src/order/workflows/return/confirm-receive-return-request.ts +++ b/packages/core/core-flows/src/order/workflows/return/confirm-receive-return-request.ts @@ -3,6 +3,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderReturnItemDTO, ReturnDTO, } from "@medusajs/types" @@ -134,7 +135,9 @@ export const confirmReturnReceiveWorkflowId = "confirm-return-receive" */ export const confirmReturnReceiveWorkflow = createWorkflow( confirmReturnReceiveWorkflowId, - function (input: ConfirmReceiveReturnRequestWorkflowInput): WorkflowResponse { + function ( + input: ConfirmReceiveReturnRequestWorkflowInput + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: [ diff --git a/packages/core/core-flows/src/order/workflows/return/confirm-return-request.ts b/packages/core/core-flows/src/order/workflows/return/confirm-return-request.ts index 4945c7b1ee..f10f110129 100644 --- a/packages/core/core-flows/src/order/workflows/return/confirm-return-request.ts +++ b/packages/core/core-flows/src/order/workflows/return/confirm-return-request.ts @@ -2,6 +2,7 @@ import { FulfillmentWorkflow, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, ReturnDTO, } from "@medusajs/types" import { @@ -137,7 +138,9 @@ export const confirmReturnRequestWorkflowId = "confirm-return-request" */ export const confirmReturnRequestWorkflow = createWorkflow( confirmReturnRequestWorkflowId, - function (input: ConfirmReturnRequestWorkflowInput): WorkflowResponse { + function ( + input: ConfirmReturnRequestWorkflowInput + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "location_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/return/create-return-shipping-method.ts b/packages/core/core-flows/src/order/workflows/return/create-return-shipping-method.ts index 656ead0fab..1f51ead889 100644 --- a/packages/core/core-flows/src/order/workflows/return/create-return-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/return/create-return-shipping-method.ts @@ -2,6 +2,7 @@ import { BigNumberInput, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, ReturnDTO, } from "@medusajs/types" import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils" @@ -53,7 +54,7 @@ export const createReturnShippingMethodWorkflow = createWorkflow( exchange_id?: string shipping_option_id: string custom_price?: BigNumberInput - }): WorkflowResponse { + }): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/return/dismiss-item-return-request.ts b/packages/core/core-flows/src/order/workflows/return/dismiss-item-return-request.ts index bedb96dc14..8e96b4e5a7 100644 --- a/packages/core/core-flows/src/order/workflows/return/dismiss-item-return-request.ts +++ b/packages/core/core-flows/src/order/workflows/return/dismiss-item-return-request.ts @@ -1,6 +1,7 @@ import { OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -55,7 +56,7 @@ export const dismissItemReturnRequestWorkflow = createWorkflow( dismissItemReturnRequestWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at", "items.*"], diff --git a/packages/core/core-flows/src/order/workflows/return/receive-item-return-request.ts b/packages/core/core-flows/src/order/workflows/return/receive-item-return-request.ts index 5e41c110f9..b92442b8c1 100644 --- a/packages/core/core-flows/src/order/workflows/return/receive-item-return-request.ts +++ b/packages/core/core-flows/src/order/workflows/return/receive-item-return-request.ts @@ -1,6 +1,7 @@ import { OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -55,7 +56,7 @@ export const receiveItemReturnRequestWorkflow = createWorkflow( receiveItemReturnRequestWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at", "items.*"], diff --git a/packages/core/core-flows/src/order/workflows/return/remove-item-receive-return-action.ts b/packages/core/core-flows/src/order/workflows/return/remove-item-receive-return-action.ts index 0335d015e7..e57118b8d0 100644 --- a/packages/core/core-flows/src/order/workflows/return/remove-item-receive-return-action.ts +++ b/packages/core/core-flows/src/order/workflows/return/remove-item-receive-return-action.ts @@ -2,6 +2,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -72,7 +73,7 @@ export const removeItemReceiveReturnActionWorkflow = createWorkflow( removeItemReceiveReturnActionWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], @@ -102,7 +103,12 @@ export const removeItemReceiveReturnActionWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - removeItemReceiveReturnActionValidationStep({ order, input, orderReturn, orderChange }) + removeItemReceiveReturnActionValidationStep({ + order, + input, + orderReturn, + orderChange, + }) deleteOrderChangeActionsStep({ ids: [input.action_id] }) diff --git a/packages/core/core-flows/src/order/workflows/return/remove-item-return-action.ts b/packages/core/core-flows/src/order/workflows/return/remove-item-return-action.ts index e230930027..070c965666 100644 --- a/packages/core/core-flows/src/order/workflows/return/remove-item-return-action.ts +++ b/packages/core/core-flows/src/order/workflows/return/remove-item-return-action.ts @@ -2,6 +2,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -66,7 +67,7 @@ export const removeItemReturnActionWorkflow = createWorkflow( removeItemReturnActionWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], @@ -106,7 +107,12 @@ export const removeItemReturnActionWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - removeReturnItemActionValidationStep({ order, input, orderReturn, orderChange }) + removeReturnItemActionValidationStep({ + order, + input, + orderReturn, + orderChange, + }) deleteOrderChangeActionsStep({ ids: [input.action_id] }) diff --git a/packages/core/core-flows/src/order/workflows/return/remove-return-shipping-method.ts b/packages/core/core-flows/src/order/workflows/return/remove-return-shipping-method.ts index d53c48cb2f..bb9d5b0249 100644 --- a/packages/core/core-flows/src/order/workflows/return/remove-return-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/return/remove-return-shipping-method.ts @@ -1,7 +1,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, - OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -65,7 +65,7 @@ export const removeReturnShippingMethodWorkflow = createWorkflow( removeReturnShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], @@ -87,7 +87,11 @@ export const removeReturnShippingMethodWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - removeReturnShippingMethodValidationStep({ orderReturn, orderChange, input }) + removeReturnShippingMethodValidationStep({ + orderReturn, + orderChange, + input, + }) const dataToRemove = transform( { orderChange, input }, diff --git a/packages/core/core-flows/src/order/workflows/return/request-item-return.ts b/packages/core/core-flows/src/order/workflows/return/request-item-return.ts index f63a6d88f6..a1b8188e71 100644 --- a/packages/core/core-flows/src/order/workflows/return/request-item-return.ts +++ b/packages/core/core-flows/src/order/workflows/return/request-item-return.ts @@ -1,6 +1,7 @@ import { OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -61,7 +62,7 @@ export const requestItemReturnWorkflow = createWorkflow( requestItemReturnWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/return/update-receive-item-return-request.ts b/packages/core/core-flows/src/order/workflows/return/update-receive-item-return-request.ts index 22177e4149..531fb7f2d5 100644 --- a/packages/core/core-flows/src/order/workflows/return/update-receive-item-return-request.ts +++ b/packages/core/core-flows/src/order/workflows/return/update-receive-item-return-request.ts @@ -2,6 +2,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -76,7 +77,7 @@ export const updateReceiveItemReturnRequestWorkflow = createWorkflow( updateReceiveItemReturnRequestWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], @@ -106,7 +107,12 @@ export const updateReceiveItemReturnRequestWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - updateReceiveItemReturnRequestValidationStep({ order, input, orderReturn, orderChange }) + updateReceiveItemReturnRequestValidationStep({ + order, + input, + orderReturn, + orderChange, + }) const updateData = transform( { orderChange, input }, diff --git a/packages/core/core-flows/src/order/workflows/return/update-request-item-return.ts b/packages/core/core-flows/src/order/workflows/return/update-request-item-return.ts index a67d1f9975..234cb9be22 100644 --- a/packages/core/core-flows/src/order/workflows/return/update-request-item-return.ts +++ b/packages/core/core-flows/src/order/workflows/return/update-request-item-return.ts @@ -2,16 +2,17 @@ import { OrderChangeActionDTO, OrderChangeDTO, OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" -import { ChangeActionType, isDefined, OrderChangeStatus } from "@medusajs/utils" +import { ChangeActionType, OrderChangeStatus, isDefined } from "@medusajs/utils" import { + WorkflowData, + WorkflowResponse, createStep, createWorkflow, transform, - WorkflowData, - WorkflowResponse, } from "@medusajs/workflows-sdk" import { useRemoteQueryStep } from "../../../common" import { @@ -81,7 +82,7 @@ export const updateRequestItemReturnWorkflow = createWorkflow( updateRequestItemReturnWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], @@ -111,7 +112,12 @@ export const updateRequestItemReturnWorkflow = createWorkflow( list: false, }).config({ name: "order-change-query" }) - updateRequestItemReturnValidationStep({ order, input, orderReturn, orderChange }) + updateRequestItemReturnValidationStep({ + order, + input, + orderReturn, + orderChange, + }) const updateData = transform( { orderChange, input }, diff --git a/packages/core/core-flows/src/order/workflows/return/update-return-shipping-method.ts b/packages/core/core-flows/src/order/workflows/return/update-return-shipping-method.ts index bda62fa1bc..d0e6e99574 100644 --- a/packages/core/core-flows/src/order/workflows/return/update-return-shipping-method.ts +++ b/packages/core/core-flows/src/order/workflows/return/update-return-shipping-method.ts @@ -1,7 +1,7 @@ import { OrderChangeActionDTO, OrderChangeDTO, - OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -67,7 +67,7 @@ export const updateReturnShippingMethodWorkflow = createWorkflow( updateReturnShippingMethodWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/core-flows/src/order/workflows/return/update-return.ts b/packages/core/core-flows/src/order/workflows/return/update-return.ts index 91b2a596f9..8773cdf956 100644 --- a/packages/core/core-flows/src/order/workflows/return/update-return.ts +++ b/packages/core/core-flows/src/order/workflows/return/update-return.ts @@ -1,6 +1,6 @@ import { OrderChangeDTO, - OrderDTO, + OrderPreviewDTO, OrderWorkflow, ReturnDTO, } from "@medusajs/types" @@ -45,7 +45,7 @@ export const updateReturnWorkflow = createWorkflow( updateReturnWorkflowId, function ( input: WorkflowData - ): WorkflowResponse { + ): WorkflowResponse { const orderReturn: ReturnDTO = useRemoteQueryStep({ entry_point: "return", fields: ["id", "status", "order_id", "canceled_at"], diff --git a/packages/core/types/src/http/claim/admin/responses.ts b/packages/core/types/src/http/claim/admin/responses.ts index 539703dc4b..5adad75790 100644 --- a/packages/core/types/src/http/claim/admin/responses.ts +++ b/packages/core/types/src/http/claim/admin/responses.ts @@ -1,4 +1,4 @@ -import { OrderDTO } from "../../../order" +import { OrderDTO, OrderPreviewDTO } from "../../../order" import { DeleteResponse, PaginatedResponse } from "../../common" import { AdminReturn } from "../../return" import { AdminClaim } from "./entities" @@ -18,12 +18,12 @@ export interface AdminClaimOrderResponse { } export interface AdminClaimPreviewResponse { - order_preview: OrderDTO + order_preview: OrderPreviewDTO claim: AdminClaim } export interface AdminClaimReturnPreviewResponse { - order_preview: OrderDTO + order_preview: OrderPreviewDTO return: AdminReturn } diff --git a/packages/core/types/src/http/exchange/admin/responses.ts b/packages/core/types/src/http/exchange/admin/responses.ts index c6046a252f..a322dbbcbe 100644 --- a/packages/core/types/src/http/exchange/admin/responses.ts +++ b/packages/core/types/src/http/exchange/admin/responses.ts @@ -1,14 +1,14 @@ -import { OrderDTO } from "../../../order"; -import { PaginatedResponse } from "../../common"; -import { AdminReturn } from "../../return"; -import { AdminExchange } from "./entities"; +import { OrderDTO, OrderPreviewDTO } from "../../../order" +import { PaginatedResponse } from "../../common" +import { AdminReturn } from "../../return" +import { AdminExchange } from "./entities" export interface AdminExchangeResponse { exchange: AdminExchange } export type AdminExchangeListResponse = PaginatedResponse<{ - exchanges: AdminExchange + exchanges: AdminExchange }> export interface AdminExchangeOrderResponse { @@ -17,15 +17,16 @@ export interface AdminExchangeOrderResponse { } export interface AdminExchangePreviewResponse { - order_preview: OrderDTO + order_preview: OrderPreviewDTO exchange: AdminExchange } -export interface AdminExchangeRequestResponse extends AdminExchangePreviewResponse { +export interface AdminExchangeRequestResponse + extends AdminExchangePreviewResponse { return: AdminReturn } export interface AdminExchangeReturnResponse { - order_preview: OrderDTO + order_preview: OrderPreviewDTO return: AdminReturn -} \ No newline at end of file +} diff --git a/packages/core/types/src/http/index.ts b/packages/core/types/src/http/index.ts index a4f1360351..ece9ffb7e7 100644 --- a/packages/core/types/src/http/index.ts +++ b/packages/core/types/src/http/index.ts @@ -16,6 +16,7 @@ export * from "./inventory-level" export * from "./invite" export * from "./notification" export * from "./order" +export * from "./order-edit" export * from "./payment" export * from "./price-list" export * from "./pricing" diff --git a/packages/core/types/src/http/order-edit/admin/index.ts b/packages/core/types/src/http/order-edit/admin/index.ts new file mode 100644 index 0000000000..fdedd9d752 --- /dev/null +++ b/packages/core/types/src/http/order-edit/admin/index.ts @@ -0,0 +1 @@ +export * from "./responses" diff --git a/packages/core/types/src/http/order-edit/admin/responses.ts b/packages/core/types/src/http/order-edit/admin/responses.ts new file mode 100644 index 0000000000..97b119cd02 --- /dev/null +++ b/packages/core/types/src/http/order-edit/admin/responses.ts @@ -0,0 +1,5 @@ +import { OrderPreviewDTO } from "../../../order" + +export interface AdminOrderEditPreviewResponse { + order_preview: OrderPreviewDTO +} diff --git a/packages/core/types/src/http/order-edit/common.ts b/packages/core/types/src/http/order-edit/common.ts new file mode 100644 index 0000000000..27d8559be5 --- /dev/null +++ b/packages/core/types/src/http/order-edit/common.ts @@ -0,0 +1,9 @@ +export interface BaseOrderEditItem { + id: string + order_id: string + item_id: string + quantity: number + metadata?: Record + created_at: string | null + updated_at: string | null +} diff --git a/packages/core/types/src/http/order-edit/index.ts b/packages/core/types/src/http/order-edit/index.ts new file mode 100644 index 0000000000..1b64bd005a --- /dev/null +++ b/packages/core/types/src/http/order-edit/index.ts @@ -0,0 +1,2 @@ +export * from "./admin" +export * from "./common" diff --git a/packages/core/types/src/workflow/order/begin-order-edit.ts b/packages/core/types/src/workflow/order/begin-order-edit.ts index 4013db766b..0225157142 100644 --- a/packages/core/types/src/workflow/order/begin-order-edit.ts +++ b/packages/core/types/src/workflow/order/begin-order-edit.ts @@ -1,4 +1,4 @@ -export interface BeginOrderOrderEditWorkflowInput { +export interface BeginorderEditWorkflowInput { order_id: string created_by?: string internal_note?: string diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts index a999b78349..45e928fe65 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts @@ -2,6 +2,7 @@ import { removeItemExchangeActionWorkflow, updateExchangeAddItemWorkflow, } from "@medusajs/core-flows" +import { HttpTypes } from "@medusajs/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, @@ -10,11 +11,10 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" -import { AdminPostExhangesItemsActionReqSchemaType } from "../../../../validators" -import { HttpTypes } from "@medusajs/types" +import { AdminPostExchangesItemsActionReqSchemaType } from "../../../../validators" export const POST = async ( - req: AuthenticatedMedusaRequest, + req: AuthenticatedMedusaRequest, res: MedusaResponse ) => { const { id, action_id } = req.params diff --git a/packages/medusa/src/api/admin/exchanges/middlewares.ts b/packages/medusa/src/api/admin/exchanges/middlewares.ts index 657632ed7a..eff47d835f 100644 --- a/packages/medusa/src/api/admin/exchanges/middlewares.ts +++ b/packages/medusa/src/api/admin/exchanges/middlewares.ts @@ -7,11 +7,11 @@ import { AdminGetOrdersParams, AdminPostCancelExchangeReqSchema, AdminPostExchangesAddItemsReqSchema, + AdminPostExchangesItemsActionReqSchema, AdminPostExchangesRequestItemsReturnActionReqSchema, AdminPostExchangesReturnRequestItemsReqSchema, AdminPostExchangesShippingActionReqSchema, AdminPostExchangesShippingReqSchema, - AdminPostExhangesItemsActionReqSchema, AdminPostOrderExchangesReqSchema, } from "./validators" @@ -129,7 +129,7 @@ export const adminExchangeRoutesMiddlewares: MiddlewareRoute[] = [ method: ["POST"], matcher: "/admin/exchanges/:id/outbound/items/:action_id", middlewares: [ - validateAndTransformBody(AdminPostExhangesItemsActionReqSchema), + validateAndTransformBody(AdminPostExchangesItemsActionReqSchema), validateAndTransformQuery( AdminGetOrdersOrderParams, QueryConfig.retrieveTransformQueryConfig diff --git a/packages/medusa/src/api/admin/exchanges/validators.ts b/packages/medusa/src/api/admin/exchanges/validators.ts index 4f59493356..62965876fe 100644 --- a/packages/medusa/src/api/admin/exchanges/validators.ts +++ b/packages/medusa/src/api/admin/exchanges/validators.ts @@ -160,11 +160,11 @@ export type AdminPostExchangesConfirmRequestReqSchemaType = z.infer< typeof AdminPostExchangesConfirmRequestReqSchema > -export const AdminPostExhangesItemsActionReqSchema = z.object({ +export const AdminPostExchangesItemsActionReqSchema = z.object({ quantity: z.number().optional(), internal_note: z.string().nullish().optional(), }) -export type AdminPostExhangesItemsActionReqSchemaType = z.infer< - typeof AdminPostExhangesItemsActionReqSchema +export type AdminPostExchangesItemsActionReqSchemaType = z.infer< + typeof AdminPostExchangesItemsActionReqSchema > diff --git a/packages/medusa/src/api/admin/order-edits/[id]/confirm/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/confirm/route.ts new file mode 100644 index 0000000000..13994d05af --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/[id]/confirm/route.ts @@ -0,0 +1,21 @@ +import { confirmOrderEditRequestWorkflow } from "@medusajs/core-flows" +import { HttpTypes } from "@medusajs/types" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../../../types/routing" + +export const POST = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const { id } = req.params + + const { result } = await confirmOrderEditRequestWorkflow(req.scope).run({ + input: { order_id: id }, + }) + + res.json({ + order_preview: result, + }) +} diff --git a/packages/medusa/src/api/admin/order-edits/[id]/items/[action_id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/items/[action_id]/route.ts new file mode 100644 index 0000000000..103ddfca40 --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/[id]/items/[action_id]/route.ts @@ -0,0 +1,49 @@ +import { + removeItemOrderEditActionWorkflow, + updateOrderEditAddItemWorkflow, +} from "@medusajs/core-flows" +import { HttpTypes } from "@medusajs/types" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../../../../types/routing" +import { AdminPostOrderEditsItemsActionReqSchemaType } from "../../../validators" + +export const POST = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const { id, action_id } = req.params + + const { result } = await updateOrderEditAddItemWorkflow(req.scope).run({ + input: { + data: { ...req.validatedBody }, + order_id: id, + action_id, + }, + }) + + res.json({ + order_preview: result, + }) +} + +export const DELETE = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const { id, action_id } = req.params + + const { result: orderPreview } = await removeItemOrderEditActionWorkflow( + req.scope + ).run({ + input: { + order_id: id, + action_id, + }, + }) + + res.json({ + order_preview: orderPreview, + }) +} diff --git a/packages/medusa/src/api/admin/order-edits/[id]/items/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/items/route.ts new file mode 100644 index 0000000000..1c9fe71a9a --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/[id]/items/route.ts @@ -0,0 +1,23 @@ +import { orderEditAddNewItemWorkflow } from "@medusajs/core-flows" + +import { HttpTypes } from "@medusajs/types" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../../../types/routing" +import { AdminPostOrderEditsAddItemsReqSchemaType } from "../../validators" + +export const POST = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const { id } = req.params + + const { result } = await orderEditAddNewItemWorkflow(req.scope).run({ + input: { ...req.validatedBody, order_id: id }, + }) + + res.json({ + order_preview: result, + }) +} diff --git a/packages/medusa/src/api/admin/order-edits/[id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/route.ts new file mode 100644 index 0000000000..680833dd64 --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/[id]/route.ts @@ -0,0 +1,25 @@ +import { cancelBeginOrderEditWorkflow } from "@medusajs/core-flows" +import { DeleteResponse } from "@medusajs/types" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../../types/routing" + +export const DELETE = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse> +) => { + const { id } = req.params + + await cancelBeginOrderEditWorkflow(req.scope).run({ + input: { + order_id: id, + }, + }) + + res.status(200).json({ + id, + object: "order-edit", + deleted: true, + }) +} diff --git a/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/[action_id]/route.ts new file mode 100644 index 0000000000..da19f798ff --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/[action_id]/route.ts @@ -0,0 +1,51 @@ +import { + removeOrderEditShippingMethodWorkflow, + updateOrderEditShippingMethodWorkflow, +} from "@medusajs/core-flows" +import { HttpTypes } from "@medusajs/types" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../../../../types/routing" +import { AdminPostOrderEditsShippingActionReqSchemaType } from "../../../validators" + +export const POST = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const { id, action_id } = req.params + + const { result } = await updateOrderEditShippingMethodWorkflow(req.scope).run( + { + input: { + data: { ...req.validatedBody }, + order_id: id, + action_id, + }, + } + ) + + res.json({ + order_preview: result, + }) +} + +export const DELETE = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const { id, action_id } = req.params + + const { result: orderPreview } = await removeOrderEditShippingMethodWorkflow( + req.scope + ).run({ + input: { + order_id: id, + action_id, + }, + }) + + res.json({ + order_preview: orderPreview, + }) +} diff --git a/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/route.ts new file mode 100644 index 0000000000..cd0ba3e13e --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/route.ts @@ -0,0 +1,24 @@ +import { createOrderEditShippingMethodWorkflow } from "@medusajs/core-flows" +import { HttpTypes } from "@medusajs/types" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../../../types/routing" +import { AdminPostOrderEditsShippingReqSchemaType } from "../../validators" + +export const POST = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const { id } = req.params + + const { result } = await createOrderEditShippingMethodWorkflow(req.scope).run( + { + input: { ...req.validatedBody, order_id: id }, + } + ) + + res.json({ + order_preview: result, + }) +} diff --git a/packages/medusa/src/api/admin/order-edits/middlewares.ts b/packages/medusa/src/api/admin/order-edits/middlewares.ts new file mode 100644 index 0000000000..df8bc62cae --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/middlewares.ts @@ -0,0 +1,71 @@ +import { MiddlewareRoute } from "@medusajs/framework" +import { validateAndTransformBody } from "../../utils/validate-body" +import { + AdminPostOrderEditsAddItemsReqSchema, + AdminPostOrderEditsItemsActionReqSchema, + AdminPostOrderEditsReqSchema, + AdminPostOrderEditsShippingActionReqSchema, + AdminPostOrderEditsShippingReqSchema, +} from "./validators" + +export const adminOrderEditRoutesMiddlewares: MiddlewareRoute[] = [ + { + method: ["GET"], + matcher: "/admin/order-edits/:id", + middlewares: [], + }, + { + method: ["POST"], + matcher: "/admin/order-edits", + middlewares: [validateAndTransformBody(AdminPostOrderEditsReqSchema)], + }, + + { + method: ["POST"], + matcher: "/admin/order-edits/:id/items", + middlewares: [ + validateAndTransformBody(AdminPostOrderEditsAddItemsReqSchema), + ], + }, + { + method: ["POST"], + matcher: "/admin/order-edits/:id/items/:action_id", + middlewares: [ + validateAndTransformBody(AdminPostOrderEditsItemsActionReqSchema), + ], + }, + { + method: ["DELETE"], + matcher: "/admin/order-edits/:id/items/:action_id", + middlewares: [], + }, + { + method: ["POST"], + matcher: "/admin/order-edits/:id/shipping-method", + middlewares: [ + validateAndTransformBody(AdminPostOrderEditsShippingReqSchema), + ], + }, + { + method: ["POST"], + matcher: "/admin/order-edits/:id/shipping-method/:action_id", + middlewares: [ + validateAndTransformBody(AdminPostOrderEditsShippingActionReqSchema), + ], + }, + { + method: ["DELETE"], + matcher: "/admin/order-edits/:id/shipping-method/:action_id", + middlewares: [], + }, + { + method: ["POST"], + matcher: "/admin/order-edits/:id/confirm", + middlewares: [], + }, + { + method: ["DELETE"], + matcher: "/admin/order-edits/:id", + middlewares: [], + }, +] diff --git a/packages/medusa/src/api/admin/order-edits/query-config.ts b/packages/medusa/src/api/admin/order-edits/query-config.ts new file mode 100644 index 0000000000..e4c8699c09 --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/query-config.ts @@ -0,0 +1,24 @@ +export const defaultAdminOrderEditFields = [ + "id", + "order_id", + "display_id", + "order_version", + "created_at", + "updated_at", + "canceled_at", +] + +export const defaultAdminDetailsOrderEditFields = [ + ...defaultAdminOrderEditFields, +] + +export const retrieveTransformQueryConfig = { + defaultFields: defaultAdminDetailsOrderEditFields, + isList: false, +} + +export const listTransformQueryConfig = { + defaults: defaultAdminOrderEditFields, + defaultLimit: 20, + isList: true, +} diff --git a/packages/medusa/src/api/admin/order-edits/route.ts b/packages/medusa/src/api/admin/order-edits/route.ts new file mode 100644 index 0000000000..f319896ae3 --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/route.ts @@ -0,0 +1,41 @@ +import { beginOrderEditOrderWorkflow } from "@medusajs/core-flows" +import { HttpTypes } from "@medusajs/types" +import { + ContainerRegistrationKeys, + remoteQueryObjectFromString, +} from "@medusajs/utils" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "../../../types/routing" +import { AdminPostOrderEditsReqSchemaType } from "./validators" + +export const POST = async ( + req: AuthenticatedMedusaRequest, + res: MedusaResponse +) => { + const input = req.validatedBody as AdminPostOrderEditsReqSchemaType + const remoteQuery = req.scope.resolve(ContainerRegistrationKeys.REMOTE_QUERY) + + const workflow = beginOrderEditOrderWorkflow(req.scope) + const { result } = await workflow.run({ + input, + }) + + const queryObject = remoteQueryObjectFromString({ + entryPoint: "order", + variables: { + id: result.order_id, + filters: { + ...req.filterableFields, + }, + }, + fields: req.remoteQueryConfig.fields, + }) + + const [order] = await remoteQuery(queryObject) + + res.json({ + order, + }) +} diff --git a/packages/medusa/src/api/admin/order-edits/validators.ts b/packages/medusa/src/api/admin/order-edits/validators.ts new file mode 100644 index 0000000000..3e70751cfc --- /dev/null +++ b/packages/medusa/src/api/admin/order-edits/validators.ts @@ -0,0 +1,58 @@ +import { z } from "zod" + +export const AdminPostOrderEditsReqSchema = z.object({ + order_id: z.string(), + description: z.string().optional(), + internal_note: z.string().optional(), + metadata: z.record(z.unknown()).nullish(), +}) +export type AdminPostOrderEditsReqSchemaType = z.infer< + typeof AdminPostOrderEditsReqSchema +> + +export const AdminPostOrderEditsShippingReqSchema = z.object({ + shipping_option_id: z.string(), + custom_price: z.number().optional(), + description: z.string().optional(), + internal_note: z.string().optional(), + metadata: z.record(z.unknown()).optional(), +}) + +export type AdminPostOrderEditsShippingReqSchemaType = z.infer< + typeof AdminPostOrderEditsShippingReqSchema +> + +export const AdminPostOrderEditsShippingActionReqSchema = z.object({ + custom_price: z.number().optional(), + internal_note: z.string().nullish().optional(), + metadata: z.record(z.unknown()).nullish().optional(), +}) + +export type AdminPostOrderEditsShippingActionReqSchemaType = z.infer< + typeof AdminPostOrderEditsShippingActionReqSchema +> + +export const AdminPostOrderEditsAddItemsReqSchema = z.object({ + items: z.array( + z.object({ + variant_id: z.string(), + quantity: z.number(), + unit_price: z.number().optional(), + internal_note: z.string().optional(), + allow_backorder: z.boolean().optional(), + metadata: z.record(z.unknown()).optional(), + }) + ), +}) + +export type AdminPostOrderEditsAddItemsReqSchemaType = z.infer< + typeof AdminPostOrderEditsAddItemsReqSchema +> +export const AdminPostOrderEditsItemsActionReqSchema = z.object({ + quantity: z.number().optional(), + internal_note: z.string().nullish().optional(), +}) + +export type AdminPostOrderEditsItemsActionReqSchemaType = z.infer< + typeof AdminPostOrderEditsItemsActionReqSchema +> diff --git a/packages/medusa/src/api/middlewares.ts b/packages/medusa/src/api/middlewares.ts index 12bda16e96..e06b04e4f9 100644 --- a/packages/medusa/src/api/middlewares.ts +++ b/packages/medusa/src/api/middlewares.ts @@ -14,6 +14,7 @@ import { adminFulfillmentsRoutesMiddlewares } from "./admin/fulfillments/middlew import { adminInventoryRoutesMiddlewares } from "./admin/inventory-items/middlewares" import { adminInviteRoutesMiddlewares } from "./admin/invites/middlewares" import { adminNotificationRoutesMiddlewares } from "./admin/notifications/middlewares" +import { adminOrderEditRoutesMiddlewares } from "./admin/order-edits/middlewares" import { adminOrderRoutesMiddlewares } from "./admin/orders/middlewares" import { adminPaymentRoutesMiddlewares } from "./admin/payments/middlewares" import { adminPriceListsRoutesMiddlewares } from "./admin/price-lists/middlewares" @@ -112,4 +113,5 @@ export default defineMiddlewares([ ...adminRefundReasonsRoutesMiddlewares, ...adminExchangeRoutesMiddlewares, ...adminProductVariantRoutesMiddlewares, + ...adminOrderEditRoutesMiddlewares, ])