feat(medusa,core-flows,types,js-sdk): decline / cancel order transfer (#10202)
**What** - **core-flows**: - cancel transfer - decline transfer - **API**: - admin cancel transfer - store decline transfer - store cancel transfer - **js-sdk**: - add methods for store endpoints --- CLOSES CMRC-726
This commit is contained in:
@@ -141,6 +141,54 @@ medusaIntegrationTestRunner({
|
|||||||
expect(finalOrderResult.customer_id).toEqual(customer.id)
|
expect(finalOrderResult.customer_id).toEqual(customer.id)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("should cancel an order transfer request from admin successfully", async () => {
|
||||||
|
await api.post(
|
||||||
|
`/admin/orders/${order.id}/transfer`,
|
||||||
|
{
|
||||||
|
customer_id: customer.id,
|
||||||
|
},
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
|
||||||
|
await api.get(
|
||||||
|
`/admin/orders/${order.id}?fields=+customer_id,+email`,
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
|
||||||
|
let orderPreviewResult = (
|
||||||
|
await api.get(`/admin/orders/${order.id}/preview`, adminHeaders)
|
||||||
|
).data.order
|
||||||
|
|
||||||
|
expect(orderPreviewResult).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
customer_id: customer.id,
|
||||||
|
order_change: expect.objectContaining({
|
||||||
|
change_type: "transfer",
|
||||||
|
status: "requested",
|
||||||
|
requested_by: user.id,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
await api.post(
|
||||||
|
`/admin/orders/${order.id}/transfer/cancel`,
|
||||||
|
{},
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
|
||||||
|
orderPreviewResult = (
|
||||||
|
await api.get(`/admin/orders/${order.id}/preview`, adminHeaders)
|
||||||
|
).data.order
|
||||||
|
|
||||||
|
expect(orderPreviewResult.order_change).not.toBeDefined()
|
||||||
|
|
||||||
|
const orderChangesResult = (
|
||||||
|
await api.get(`/admin/orders/${order.id}/changes`, adminHeaders)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChangesResult.length).toEqual(0)
|
||||||
|
})
|
||||||
|
|
||||||
it("should fail to request order transfer to a guest customer", async () => {
|
it("should fail to request order transfer to a guest customer", async () => {
|
||||||
const customer = (
|
const customer = (
|
||||||
await api.post(
|
await api.post(
|
||||||
@@ -238,13 +286,9 @@ medusaIntegrationTestRunner({
|
|||||||
let storeHeaders
|
let storeHeaders
|
||||||
let signInToken
|
let signInToken
|
||||||
|
|
||||||
let orderModule
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const container = getContainer()
|
const container = getContainer()
|
||||||
|
|
||||||
orderModule = await container.resolve(Modules.ORDER)
|
|
||||||
|
|
||||||
const publishableKey = await generatePublishableKey(container)
|
const publishableKey = await generatePublishableKey(container)
|
||||||
storeHeaders = generateStoreHeaders({ publishableKey })
|
storeHeaders = generateStoreHeaders({ publishableKey })
|
||||||
|
|
||||||
@@ -301,10 +345,12 @@ medusaIntegrationTestRunner({
|
|||||||
expect(storeOrder.email).toEqual("tony@stark-industries.com")
|
expect(storeOrder.email).toEqual("tony@stark-industries.com")
|
||||||
expect(storeOrder.customer_id).not.toEqual(customer.id)
|
expect(storeOrder.customer_id).not.toEqual(customer.id)
|
||||||
|
|
||||||
const orderChanges = await orderModule.listOrderChanges(
|
const orderChanges = (
|
||||||
{ order_id: order.id },
|
await api.get(
|
||||||
{ relations: ["actions"] }
|
`/admin/orders/${order.id}/changes?fields=*actions`,
|
||||||
|
adminHeaders
|
||||||
)
|
)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
expect(orderChanges.length).toEqual(1)
|
expect(orderChanges.length).toEqual(1)
|
||||||
expect(orderChanges[0]).toEqual(
|
expect(orderChanges[0]).toEqual(
|
||||||
@@ -344,6 +390,280 @@ medusaIntegrationTestRunner({
|
|||||||
// 4. Customer account is now associated with the order (email on the order is still as original, guest email)
|
// 4. Customer account is now associated with the order (email on the order is still as original, guest email)
|
||||||
expect(finalOrder.customer_id).toEqual(customer.id)
|
expect(finalOrder.customer_id).toEqual(customer.id)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("should cancel a customer transfer request as an admin", async () => {
|
||||||
|
await api.post(
|
||||||
|
`/store/orders/${order.id}/transfer/request`,
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
authorization: `Bearer ${signInToken}`,
|
||||||
|
...storeHeaders.headers,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
let orderChanges = (
|
||||||
|
await api.get(
|
||||||
|
`/admin/orders/${order.id}/changes?fields=*actions`,
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(1)
|
||||||
|
expect(orderChanges[0]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
change_type: "transfer",
|
||||||
|
status: "requested",
|
||||||
|
requested_by: customer.id,
|
||||||
|
created_by: customer.id,
|
||||||
|
confirmed_by: null,
|
||||||
|
confirmed_at: null,
|
||||||
|
declined_by: null,
|
||||||
|
actions: expect.arrayContaining([
|
||||||
|
expect.objectContaining({
|
||||||
|
version: 2,
|
||||||
|
action: "TRANSFER_CUSTOMER",
|
||||||
|
reference: "customer",
|
||||||
|
reference_id: customer.id,
|
||||||
|
details: expect.objectContaining({
|
||||||
|
token: expect.any(String),
|
||||||
|
original_email: "tony@stark-industries.com",
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
// Admin cancels the transfer request
|
||||||
|
await api.post(
|
||||||
|
`/admin/orders/${order.id}/transfer/cancel`,
|
||||||
|
{},
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
|
||||||
|
orderChanges = (
|
||||||
|
await api.get(`/admin/orders/${order.id}/changes`, adminHeaders)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("customer should be able to cancel their own transfer request", async () => {
|
||||||
|
await api.post(
|
||||||
|
`/store/orders/${order.id}/transfer/request`,
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
authorization: `Bearer ${signInToken}`,
|
||||||
|
...storeHeaders.headers,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
let orderChanges = (
|
||||||
|
await api.get(
|
||||||
|
`/admin/orders/${order.id}/changes?fields=*actions`,
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(1)
|
||||||
|
expect(orderChanges[0]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
change_type: "transfer",
|
||||||
|
status: "requested",
|
||||||
|
requested_by: customer.id,
|
||||||
|
created_by: customer.id,
|
||||||
|
confirmed_by: null,
|
||||||
|
confirmed_at: null,
|
||||||
|
declined_by: null,
|
||||||
|
actions: expect.arrayContaining([
|
||||||
|
expect.objectContaining({
|
||||||
|
version: 2,
|
||||||
|
action: "TRANSFER_CUSTOMER",
|
||||||
|
reference: "customer",
|
||||||
|
reference_id: customer.id,
|
||||||
|
details: expect.objectContaining({
|
||||||
|
token: expect.any(String),
|
||||||
|
original_email: "tony@stark-industries.com",
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
await api.post(
|
||||||
|
`/store/orders/${order.id}/transfer/cancel`,
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
authorization: `Bearer ${signInToken}`,
|
||||||
|
...storeHeaders.headers,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
orderChanges = (
|
||||||
|
await api.get(
|
||||||
|
`/admin/orders/${order.id}/changes?fields=*actions`,
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(0)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("original customer should be able to decline a transfer request", async () => {
|
||||||
|
await api.post(
|
||||||
|
`/store/orders/${order.id}/transfer/request`,
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
authorization: `Bearer ${signInToken}`,
|
||||||
|
...storeHeaders.headers,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
let orderChanges = (
|
||||||
|
await api.get(
|
||||||
|
`/admin/orders/${order.id}/changes?fields=*actions`,
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(1)
|
||||||
|
expect(orderChanges[0]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
change_type: "transfer",
|
||||||
|
status: "requested",
|
||||||
|
requested_by: customer.id,
|
||||||
|
created_by: customer.id,
|
||||||
|
confirmed_by: null,
|
||||||
|
confirmed_at: null,
|
||||||
|
declined_by: null,
|
||||||
|
actions: expect.arrayContaining([
|
||||||
|
expect.objectContaining({
|
||||||
|
version: 2,
|
||||||
|
action: "TRANSFER_CUSTOMER",
|
||||||
|
reference: "customer",
|
||||||
|
reference_id: customer.id,
|
||||||
|
details: expect.objectContaining({
|
||||||
|
token: expect.any(String),
|
||||||
|
original_email: "tony@stark-industries.com",
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
await api.post(
|
||||||
|
`/store/orders/${order.id}/transfer/decline`,
|
||||||
|
{ token: orderChanges[0].actions[0].details.token },
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
...storeHeaders.headers,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
orderChanges = (
|
||||||
|
await api.get(
|
||||||
|
`/admin/orders/${order.id}/changes?fields=+declined_at`,
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(1)
|
||||||
|
expect(orderChanges[0]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
change_type: "transfer",
|
||||||
|
status: "declined",
|
||||||
|
requested_by: customer.id,
|
||||||
|
created_by: customer.id,
|
||||||
|
declined_at: expect.any(String),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("shound not decline a transfer request without proper token", async () => {
|
||||||
|
await api.post(
|
||||||
|
`/store/orders/${order.id}/transfer/request`,
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
authorization: `Bearer ${signInToken}`,
|
||||||
|
...storeHeaders.headers,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
let orderChanges = (
|
||||||
|
await api.get(
|
||||||
|
`/admin/orders/${order.id}/changes?fields=*actions`,
|
||||||
|
adminHeaders
|
||||||
|
)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(1)
|
||||||
|
expect(orderChanges[0]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
change_type: "transfer",
|
||||||
|
status: "requested",
|
||||||
|
requested_by: customer.id,
|
||||||
|
created_by: customer.id,
|
||||||
|
confirmed_by: null,
|
||||||
|
confirmed_at: null,
|
||||||
|
declined_by: null,
|
||||||
|
actions: expect.arrayContaining([
|
||||||
|
expect.objectContaining({
|
||||||
|
version: 2,
|
||||||
|
action: "TRANSFER_CUSTOMER",
|
||||||
|
reference: "customer",
|
||||||
|
reference_id: customer.id,
|
||||||
|
details: expect.objectContaining({
|
||||||
|
token: expect.any(String),
|
||||||
|
original_email: "tony@stark-industries.com",
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
]),
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const error = await api
|
||||||
|
.post(
|
||||||
|
`/store/orders/${order.id}/transfer/decline`,
|
||||||
|
{ token: "fake-token" },
|
||||||
|
{
|
||||||
|
headers: {
|
||||||
|
...storeHeaders.headers,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.catch((e) => e)
|
||||||
|
|
||||||
|
expect(error.response.status).toBe(400)
|
||||||
|
expect(error.response.data).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
type: "not_allowed",
|
||||||
|
message: "Invalid token.",
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
orderChanges = (
|
||||||
|
await api.get(`/admin/orders/${order.id}/changes`, adminHeaders)
|
||||||
|
).data.order_changes
|
||||||
|
|
||||||
|
expect(orderChanges.length).toEqual(1)
|
||||||
|
expect(orderChanges[0]).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
change_type: "transfer",
|
||||||
|
status: "requested",
|
||||||
|
declined_at: null,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
+2
-2
@@ -65,9 +65,9 @@ export const ProductOrganizationSection = ({
|
|||||||
title={t("fields.collection")}
|
title={t("fields.collection")}
|
||||||
value={
|
value={
|
||||||
product.collection ? (
|
product.collection ? (
|
||||||
<Badge size="2xsmall" className="w-fit" asChild>
|
<Badge size="2xsmall" className="max-w-[182px]" asChild>
|
||||||
<Link to={`/collections/${product.collection.id}`}>
|
<Link to={`/collections/${product.collection.id}`}>
|
||||||
{product.collection.title}
|
<span className="truncate">{product.collection.title}</span>
|
||||||
</Link>
|
</Link>
|
||||||
</Badge>
|
</Badge>
|
||||||
) : undefined
|
) : undefined
|
||||||
|
|||||||
@@ -80,3 +80,5 @@ export * from "./update-order-changes"
|
|||||||
export * from "./update-tax-lines"
|
export * from "./update-tax-lines"
|
||||||
export * from "./transfer/request-order-transfer"
|
export * from "./transfer/request-order-transfer"
|
||||||
export * from "./transfer/accept-order-transfer"
|
export * from "./transfer/accept-order-transfer"
|
||||||
|
export * from "./transfer/cancel-order-transfer"
|
||||||
|
export * from "./transfer/decline-order-transfer"
|
||||||
|
|||||||
@@ -41,7 +41,9 @@ export const cancelBeginOrderEditWorkflowId = "cancel-begin-order-edit"
|
|||||||
*/
|
*/
|
||||||
export const cancelBeginOrderEditWorkflow = createWorkflow(
|
export const cancelBeginOrderEditWorkflow = createWorkflow(
|
||||||
cancelBeginOrderEditWorkflowId,
|
cancelBeginOrderEditWorkflowId,
|
||||||
function (input: CancelBeginOrderEditWorkflowInput): WorkflowData<void> {
|
function (
|
||||||
|
input: WorkflowData<CancelBeginOrderEditWorkflowInput>
|
||||||
|
): WorkflowData<void> {
|
||||||
const order: OrderDTO = useRemoteQueryStep({
|
const order: OrderDTO = useRemoteQueryStep({
|
||||||
entry_point: "orders",
|
entry_point: "orders",
|
||||||
fields: ["id", "version", "canceled_at"],
|
fields: ["id", "version", "canceled_at"],
|
||||||
|
|||||||
@@ -8,17 +8,18 @@ import {
|
|||||||
WorkflowResponse,
|
WorkflowResponse,
|
||||||
createStep,
|
createStep,
|
||||||
createWorkflow,
|
createWorkflow,
|
||||||
|
transform,
|
||||||
} from "@medusajs/framework/workflows-sdk"
|
} from "@medusajs/framework/workflows-sdk"
|
||||||
import { OrderPreviewDTO } from "@medusajs/types"
|
import { OrderPreviewDTO } from "@medusajs/types"
|
||||||
|
|
||||||
import { useRemoteQueryStep } from "../../../common"
|
|
||||||
import { throwIfOrderIsCancelled } from "../../utils/order-validation"
|
|
||||||
import { previewOrderChangeStep } from "../../steps"
|
|
||||||
import {
|
import {
|
||||||
ChangeActionType,
|
ChangeActionType,
|
||||||
MedusaError,
|
MedusaError,
|
||||||
OrderChangeStatus,
|
OrderChangeStatus,
|
||||||
} from "@medusajs/utils"
|
} from "@medusajs/utils"
|
||||||
|
|
||||||
|
import { useQueryGraphStep } from "../../../common"
|
||||||
|
import { throwIfOrderIsCancelled } from "../../utils/order-validation"
|
||||||
|
import { previewOrderChangeStep } from "../../steps"
|
||||||
import { confirmOrderChanges } from "../../steps/confirm-order-changes"
|
import { confirmOrderChanges } from "../../steps/confirm-order-changes"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -62,16 +63,20 @@ export const acceptOrderTransferWorkflow = createWorkflow(
|
|||||||
function (
|
function (
|
||||||
input: WorkflowData<OrderWorkflow.AcceptOrderTransferWorkflowInput>
|
input: WorkflowData<OrderWorkflow.AcceptOrderTransferWorkflowInput>
|
||||||
): WorkflowResponse<OrderPreviewDTO> {
|
): WorkflowResponse<OrderPreviewDTO> {
|
||||||
const order: OrderDTO = useRemoteQueryStep({
|
const orderQuery = useQueryGraphStep({
|
||||||
entry_point: "orders",
|
entity: "order",
|
||||||
fields: ["id", "email", "status", "customer_id"],
|
fields: ["id", "email", "status", "customer_id"],
|
||||||
variables: { id: input.order_id },
|
filters: { id: input.order_id },
|
||||||
list: false,
|
options: { throwIfKeyNotFound: true },
|
||||||
throw_if_key_not_found: true,
|
}).config({ name: "order-query" })
|
||||||
})
|
|
||||||
|
|
||||||
const orderChange: OrderChangeDTO = useRemoteQueryStep({
|
const order = transform(
|
||||||
entry_point: "order_change",
|
{ orderQuery },
|
||||||
|
({ orderQuery }) => orderQuery.data[0]
|
||||||
|
)
|
||||||
|
|
||||||
|
const orderChangeQuery = useQueryGraphStep({
|
||||||
|
entity: "order_change",
|
||||||
fields: [
|
fields: [
|
||||||
"id",
|
"id",
|
||||||
"status",
|
"status",
|
||||||
@@ -84,15 +89,18 @@ export const acceptOrderTransferWorkflow = createWorkflow(
|
|||||||
"actions.reference_id",
|
"actions.reference_id",
|
||||||
"actions.internal_note",
|
"actions.internal_note",
|
||||||
],
|
],
|
||||||
variables: {
|
|
||||||
filters: {
|
filters: {
|
||||||
order_id: input.order_id,
|
order_id: input.order_id,
|
||||||
status: [OrderChangeStatus.REQUESTED],
|
status: [OrderChangeStatus.REQUESTED],
|
||||||
},
|
},
|
||||||
},
|
options: { throwIfKeyNotFound: true },
|
||||||
list: false,
|
|
||||||
}).config({ name: "order-change-query" })
|
}).config({ name: "order-change-query" })
|
||||||
|
|
||||||
|
const orderChange = transform(
|
||||||
|
{ orderChangeQuery },
|
||||||
|
({ orderChangeQuery }) => orderChangeQuery.data[0]
|
||||||
|
)
|
||||||
|
|
||||||
acceptOrderTransferValidationStep({
|
acceptOrderTransferValidationStep({
|
||||||
order,
|
order,
|
||||||
orderChange,
|
orderChange,
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
import {
|
||||||
|
OrderChangeDTO,
|
||||||
|
OrderDTO,
|
||||||
|
OrderWorkflow,
|
||||||
|
} from "@medusajs/framework/types"
|
||||||
|
import {
|
||||||
|
ChangeActionType,
|
||||||
|
MedusaError,
|
||||||
|
OrderChangeStatus,
|
||||||
|
} from "@medusajs/framework/utils"
|
||||||
|
import {
|
||||||
|
WorkflowData,
|
||||||
|
createStep,
|
||||||
|
createWorkflow,
|
||||||
|
transform,
|
||||||
|
} from "@medusajs/framework/workflows-sdk"
|
||||||
|
import { useQueryGraphStep } from "../../../common"
|
||||||
|
import { deleteOrderChangesStep } from "../../steps"
|
||||||
|
import {
|
||||||
|
throwIfIsCancelled,
|
||||||
|
throwIfOrderChangeIsNotActive,
|
||||||
|
} from "../../utils/order-validation"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This step validates that a requested order transfer can be canceled.
|
||||||
|
*/
|
||||||
|
export const cancelTransferOrderRequestValidationStep = createStep(
|
||||||
|
"validate-cancel-transfer-order-request",
|
||||||
|
async function ({
|
||||||
|
order,
|
||||||
|
orderChange,
|
||||||
|
input,
|
||||||
|
}: {
|
||||||
|
order: OrderDTO
|
||||||
|
orderChange: OrderChangeDTO
|
||||||
|
input: OrderWorkflow.CancelTransferOrderRequestWorkflowInput
|
||||||
|
}) {
|
||||||
|
throwIfIsCancelled(order, "Order")
|
||||||
|
throwIfOrderChangeIsNotActive({ orderChange })
|
||||||
|
|
||||||
|
if (input.actor_type === "user") {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const action = orderChange.actions?.find(
|
||||||
|
(a) => a.action === ChangeActionType.TRANSFER_CUSTOMER
|
||||||
|
)
|
||||||
|
|
||||||
|
if (action?.reference_id !== input.logged_in_user_id) {
|
||||||
|
throw new MedusaError(
|
||||||
|
MedusaError.Types.NOT_ALLOWED,
|
||||||
|
"This customer is not allowed to cancel the transfer."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
export const cancelTransferOrderRequestWorkflowId =
|
||||||
|
"cancel-transfer-order-request"
|
||||||
|
/**
|
||||||
|
* This workflow cancels a requested order transfer.
|
||||||
|
*
|
||||||
|
* Customer that requested the transfer or a store admin are allowed to cancel the order transfer request.
|
||||||
|
*/
|
||||||
|
export const cancelOrderTransferRequestWorkflow = createWorkflow(
|
||||||
|
cancelTransferOrderRequestWorkflowId,
|
||||||
|
function (
|
||||||
|
input: WorkflowData<OrderWorkflow.CancelTransferOrderRequestWorkflowInput>
|
||||||
|
): WorkflowData<void> {
|
||||||
|
const orderQuery = useQueryGraphStep({
|
||||||
|
entity: "order",
|
||||||
|
fields: ["id", "version", "canceled_at"],
|
||||||
|
filters: { id: input.order_id },
|
||||||
|
options: { throwIfKeyNotFound: true },
|
||||||
|
}).config({ name: "order-query" })
|
||||||
|
|
||||||
|
const order = transform(
|
||||||
|
{ orderQuery },
|
||||||
|
({ orderQuery }) => orderQuery.data[0]
|
||||||
|
)
|
||||||
|
|
||||||
|
const orderChangeQuery = useQueryGraphStep({
|
||||||
|
entity: "order_change",
|
||||||
|
fields: ["id", "status", "version", "actions.*"],
|
||||||
|
filters: {
|
||||||
|
order_id: input.order_id,
|
||||||
|
status: [OrderChangeStatus.PENDING, OrderChangeStatus.REQUESTED],
|
||||||
|
},
|
||||||
|
options: { throwIfKeyNotFound: true },
|
||||||
|
}).config({ name: "order-change-query" })
|
||||||
|
|
||||||
|
const orderChange = transform(
|
||||||
|
{ orderChangeQuery },
|
||||||
|
({ orderChangeQuery }) => orderChangeQuery.data[0]
|
||||||
|
)
|
||||||
|
|
||||||
|
cancelTransferOrderRequestValidationStep({ order, orderChange, input })
|
||||||
|
|
||||||
|
deleteOrderChangesStep({ ids: [orderChange.id] })
|
||||||
|
}
|
||||||
|
)
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
import {
|
||||||
|
OrderChangeDTO,
|
||||||
|
OrderDTO,
|
||||||
|
OrderWorkflow,
|
||||||
|
} from "@medusajs/framework/types"
|
||||||
|
import {
|
||||||
|
ChangeActionType,
|
||||||
|
MedusaError,
|
||||||
|
OrderChangeStatus,
|
||||||
|
} from "@medusajs/framework/utils"
|
||||||
|
import {
|
||||||
|
WorkflowData,
|
||||||
|
createStep,
|
||||||
|
createWorkflow,
|
||||||
|
transform,
|
||||||
|
} from "@medusajs/framework/workflows-sdk"
|
||||||
|
|
||||||
|
import { useQueryGraphStep } from "../../../common"
|
||||||
|
import { declineOrderChangeStep } from "../../steps"
|
||||||
|
import {
|
||||||
|
throwIfIsCancelled,
|
||||||
|
throwIfOrderChangeIsNotActive,
|
||||||
|
} from "../../utils/order-validation"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This step validates that a requested order transfer can be declineed.
|
||||||
|
*/
|
||||||
|
export const declineTransferOrderRequestValidationStep = createStep(
|
||||||
|
"validate-decline-transfer-order-request",
|
||||||
|
async function ({
|
||||||
|
order,
|
||||||
|
orderChange,
|
||||||
|
input,
|
||||||
|
}: {
|
||||||
|
order: OrderDTO
|
||||||
|
orderChange: OrderChangeDTO
|
||||||
|
input: OrderWorkflow.DeclineTransferOrderRequestWorkflowInput
|
||||||
|
}) {
|
||||||
|
throwIfIsCancelled(order, "Order")
|
||||||
|
throwIfOrderChangeIsNotActive({ orderChange })
|
||||||
|
|
||||||
|
const token = orderChange.actions?.find(
|
||||||
|
(a) => a.action === ChangeActionType.TRANSFER_CUSTOMER
|
||||||
|
)?.details!.token
|
||||||
|
|
||||||
|
if (!input.token?.length || token !== input.token) {
|
||||||
|
throw new MedusaError(MedusaError.Types.NOT_ALLOWED, "Invalid token.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
export const declineTransferOrderRequestWorkflowId =
|
||||||
|
"decline-transfer-order-request"
|
||||||
|
/**
|
||||||
|
* This workflow declines a requested order transfer.
|
||||||
|
*
|
||||||
|
* Only the original customer (who has the token) is allowed to decline the transfer.
|
||||||
|
*/
|
||||||
|
export const declineOrderTransferRequestWorkflow = createWorkflow(
|
||||||
|
declineTransferOrderRequestWorkflowId,
|
||||||
|
function (
|
||||||
|
input: WorkflowData<OrderWorkflow.DeclineTransferOrderRequestWorkflowInput>
|
||||||
|
): WorkflowData<void> {
|
||||||
|
const orderQuery = useQueryGraphStep({
|
||||||
|
entity: "order",
|
||||||
|
fields: ["id", "version", "declineed_at"],
|
||||||
|
filters: { id: input.order_id },
|
||||||
|
options: { throwIfKeyNotFound: true },
|
||||||
|
}).config({ name: "order-query" })
|
||||||
|
|
||||||
|
const order = transform(
|
||||||
|
{ orderQuery },
|
||||||
|
({ orderQuery }) => orderQuery.data[0]
|
||||||
|
)
|
||||||
|
|
||||||
|
const orderChangeQuery = useQueryGraphStep({
|
||||||
|
entity: "order_change",
|
||||||
|
fields: ["id", "status", "version", "actions.*"],
|
||||||
|
filters: {
|
||||||
|
order_id: input.order_id,
|
||||||
|
status: [OrderChangeStatus.PENDING, OrderChangeStatus.REQUESTED],
|
||||||
|
},
|
||||||
|
options: { throwIfKeyNotFound: true },
|
||||||
|
}).config({ name: "order-change-query" })
|
||||||
|
|
||||||
|
const orderChange = transform(
|
||||||
|
{ orderChangeQuery },
|
||||||
|
({ orderChangeQuery }) => orderChangeQuery.data[0]
|
||||||
|
)
|
||||||
|
|
||||||
|
declineTransferOrderRequestValidationStep({ order, orderChange, input })
|
||||||
|
|
||||||
|
declineOrderChangeStep({ id: orderChange.id })
|
||||||
|
}
|
||||||
|
)
|
||||||
@@ -131,7 +131,7 @@ export const requestOrderTransferWorkflow = createWorkflow(
|
|||||||
|
|
||||||
emitEventStep({
|
emitEventStep({
|
||||||
eventName: OrderWorkflowEvents.TRANSFER_REQUESTED,
|
eventName: OrderWorkflowEvents.TRANSFER_REQUESTED,
|
||||||
data: { id: input.order_id },
|
data: { id: input.order_id, order_change_id: change.id },
|
||||||
})
|
})
|
||||||
|
|
||||||
return new WorkflowResponse(previewOrderChangeStep(input.order_id))
|
return new WorkflowResponse(previewOrderChangeStep(input.order_id))
|
||||||
|
|||||||
@@ -1077,6 +1077,162 @@ export class Store {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method requests a order transfer from a guest account to the current, logged in customer account.
|
||||||
|
*
|
||||||
|
* Customer requesting the transfer must be logged in.
|
||||||
|
*
|
||||||
|
* @param body - The transfer's details.
|
||||||
|
* @param query - Configure the fields to retrieve in the order.
|
||||||
|
* @param headers - Headers to pass in the request.
|
||||||
|
* @returns The order details.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* sdk.store.order.requestTransfer(
|
||||||
|
* "order_123",
|
||||||
|
* {
|
||||||
|
* description: "I want to transfer this order to my friend."
|
||||||
|
* },
|
||||||
|
* {},
|
||||||
|
* {
|
||||||
|
* Authorization: `Bearer ${token}`
|
||||||
|
* }
|
||||||
|
* )
|
||||||
|
* .then(({ order }) => {
|
||||||
|
* console.log(order)
|
||||||
|
* })
|
||||||
|
*/
|
||||||
|
requestTransfer: async (
|
||||||
|
id: string,
|
||||||
|
body: HttpTypes.StoreRequestOrderTransfer,
|
||||||
|
query?: SelectParams,
|
||||||
|
headers?: ClientHeaders
|
||||||
|
) => {
|
||||||
|
return this.client.fetch<HttpTypes.StoreOrderResponse>(
|
||||||
|
`/store/orders/${id}/transfer/request`,
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers,
|
||||||
|
body,
|
||||||
|
query,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* This method cancels an order transfer request.
|
||||||
|
*
|
||||||
|
* Customer requesting the transfer must be logged in.
|
||||||
|
*
|
||||||
|
* @param id - The order's ID.
|
||||||
|
* @param query - Configure the fields to retrieve in the order.
|
||||||
|
* @param headers - Headers to pass in the request.
|
||||||
|
* @returns The order details.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* sdk.store.order.cancelTransfer(
|
||||||
|
* "order_123",
|
||||||
|
* {},
|
||||||
|
* {
|
||||||
|
* Authorization: `Bearer ${token}`
|
||||||
|
* }
|
||||||
|
* )
|
||||||
|
* .then(({ order }) => {
|
||||||
|
* console.log(order)
|
||||||
|
* })
|
||||||
|
*/
|
||||||
|
cancelTransfer: async (
|
||||||
|
id: string,
|
||||||
|
query?: SelectParams,
|
||||||
|
headers?: ClientHeaders
|
||||||
|
) => {
|
||||||
|
return this.client.fetch<HttpTypes.StoreOrderResponse>(
|
||||||
|
`/store/orders/${id}/transfer/cancel`,
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers,
|
||||||
|
query,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* The method called for the original owner to accept the order transfer to a new owner.
|
||||||
|
*
|
||||||
|
* @param id - The order's ID.
|
||||||
|
* @param body - The payload containing the transfer token.
|
||||||
|
* @param query - Configure the fields to retrieve in the order.
|
||||||
|
* @param headers - Headers to pass in the request.
|
||||||
|
* @returns The order details.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* sdk.store.order.acceptTransfer(
|
||||||
|
* "order_123",
|
||||||
|
* {
|
||||||
|
* token: "transfer_token"
|
||||||
|
* },
|
||||||
|
* {
|
||||||
|
* Authorization: `Bearer ${token}`
|
||||||
|
* }
|
||||||
|
* )
|
||||||
|
* .then(({ order }) => {
|
||||||
|
* console.log(order)
|
||||||
|
* })
|
||||||
|
*/
|
||||||
|
acceptTransfer: async (
|
||||||
|
id: string,
|
||||||
|
body: HttpTypes.StoreAcceptOrderTransfer,
|
||||||
|
query?: SelectParams,
|
||||||
|
headers?: ClientHeaders
|
||||||
|
) => {
|
||||||
|
return this.client.fetch<HttpTypes.StoreOrderResponse>(
|
||||||
|
`/store/orders/${id}/transfer/accept`,
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers,
|
||||||
|
body,
|
||||||
|
query,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* The method called for the original owner to decline the order transfer to a new owner.
|
||||||
|
*
|
||||||
|
* @param id - The order's ID.
|
||||||
|
* @param body - The payload containing the transfer token.
|
||||||
|
* @param query - Configure the fields to retrieve in the order.
|
||||||
|
* @param headers - Headers to pass in the request.
|
||||||
|
* @returns The order details.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* sdk.store.order.declineTransfer(
|
||||||
|
* "order_123",
|
||||||
|
* {
|
||||||
|
* token: "transfer_token"
|
||||||
|
* },
|
||||||
|
* {
|
||||||
|
* Authorization: `Bearer ${token}`
|
||||||
|
* }
|
||||||
|
* )
|
||||||
|
* .then(({ order }) => {
|
||||||
|
* console.log(order)
|
||||||
|
* })
|
||||||
|
*/
|
||||||
|
declineTransfer: async (
|
||||||
|
id: string,
|
||||||
|
body: HttpTypes.StoreDeclineOrderTransfer,
|
||||||
|
query?: SelectParams,
|
||||||
|
headers?: ClientHeaders
|
||||||
|
) => {
|
||||||
|
return this.client.fetch<HttpTypes.StoreOrderResponse>(
|
||||||
|
`/store/orders/${id}/transfer/decline`,
|
||||||
|
{
|
||||||
|
method: "POST",
|
||||||
|
headers,
|
||||||
|
body,
|
||||||
|
query,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
public customer = {
|
public customer = {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
export * from "./entities"
|
export * from "./entities"
|
||||||
export * from "./queries"
|
export * from "./queries"
|
||||||
export * from "./responses"
|
export * from "./responses"
|
||||||
|
export * from "./payloads"
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
export interface StoreRequestOrderTransfer {
|
||||||
|
/**
|
||||||
|
* The description of the transfer request.
|
||||||
|
*/
|
||||||
|
description?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StoreAcceptOrderTransfer {
|
||||||
|
token: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface StoreDeclineOrderTransfer {
|
||||||
|
token: string
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
export type CancelTransferOrderRequestWorkflowInput = {
|
||||||
|
order_id: string
|
||||||
|
logged_in_user_id: string
|
||||||
|
actor_type: "customer" | "user"
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
export type DeclineTransferOrderRequestWorkflowInput = {
|
||||||
|
order_id: string
|
||||||
|
token: string
|
||||||
|
}
|
||||||
@@ -17,3 +17,5 @@ export * from "./shipping-method"
|
|||||||
export * from "./update-return"
|
export * from "./update-return"
|
||||||
export * from "./request-transfer"
|
export * from "./request-transfer"
|
||||||
export * from "./accept-transfer"
|
export * from "./accept-transfer"
|
||||||
|
export * from "./cancel-transfer"
|
||||||
|
export * from "./decline-transfer"
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { cancelOrderTransferRequestWorkflow } from "@medusajs/core-flows"
|
||||||
|
import {
|
||||||
|
AuthenticatedMedusaRequest,
|
||||||
|
MedusaResponse,
|
||||||
|
} from "@medusajs/framework/http"
|
||||||
|
import { AdminOrder, HttpTypes } from "@medusajs/framework/types"
|
||||||
|
import { AdminCancelOrderTransferRequestType } from "../../../validators"
|
||||||
|
import { ContainerRegistrationKeys } from "@medusajs/framework/utils"
|
||||||
|
|
||||||
|
export const POST = async (
|
||||||
|
req: AuthenticatedMedusaRequest<AdminCancelOrderTransferRequestType>,
|
||||||
|
res: MedusaResponse<HttpTypes.AdminOrderResponse>
|
||||||
|
) => {
|
||||||
|
const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)
|
||||||
|
|
||||||
|
const orderId = req.params.id
|
||||||
|
const userId = req.auth_context.actor_id
|
||||||
|
|
||||||
|
await cancelOrderTransferRequestWorkflow(req.scope).run({
|
||||||
|
input: {
|
||||||
|
order_id: orderId,
|
||||||
|
logged_in_user_id: userId,
|
||||||
|
actor_type: req.auth_context.actor_type as "user",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const result = await query.graph({
|
||||||
|
entity: "order",
|
||||||
|
filters: { id: orderId },
|
||||||
|
fields: req.remoteQueryConfig.fields,
|
||||||
|
})
|
||||||
|
|
||||||
|
res.status(200).json({ order: result.data[0] as AdminOrder })
|
||||||
|
}
|
||||||
@@ -5,13 +5,14 @@ import {
|
|||||||
import { MiddlewareRoute } from "@medusajs/framework/http"
|
import { MiddlewareRoute } from "@medusajs/framework/http"
|
||||||
import * as QueryConfig from "./query-config"
|
import * as QueryConfig from "./query-config"
|
||||||
import {
|
import {
|
||||||
|
AdminCancelOrderTransferRequest,
|
||||||
AdminCompleteOrder,
|
AdminCompleteOrder,
|
||||||
AdminGetOrdersOrderItemsParams,
|
AdminGetOrdersOrderItemsParams,
|
||||||
AdminGetOrdersOrderParams,
|
AdminGetOrdersOrderParams,
|
||||||
AdminGetOrdersParams,
|
AdminGetOrdersParams,
|
||||||
AdminMarkOrderFulfillmentDelivered,
|
AdminMarkOrderFulfillmentDelivered,
|
||||||
AdminOrderCancelFulfillment,
|
AdminOrderCancelFulfillment,
|
||||||
AdminOrderChanges,
|
AdminOrderChangesParams,
|
||||||
AdminOrderCreateFulfillment,
|
AdminOrderCreateFulfillment,
|
||||||
AdminOrderCreateShipment,
|
AdminOrderCreateShipment,
|
||||||
AdminTransferOrder,
|
AdminTransferOrder,
|
||||||
@@ -53,7 +54,7 @@ export const adminOrderRoutesMiddlewares: MiddlewareRoute[] = [
|
|||||||
matcher: "/admin/orders/:id/changes",
|
matcher: "/admin/orders/:id/changes",
|
||||||
middlewares: [
|
middlewares: [
|
||||||
validateAndTransformQuery(
|
validateAndTransformQuery(
|
||||||
AdminOrderChanges,
|
AdminOrderChangesParams,
|
||||||
QueryConfig.retrieveOrderChangesTransformQueryConfig
|
QueryConfig.retrieveOrderChangesTransformQueryConfig
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -156,4 +157,15 @@ export const adminOrderRoutesMiddlewares: MiddlewareRoute[] = [
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
method: ["POST"],
|
||||||
|
matcher: "/admin/orders/:id/transfer/cancel",
|
||||||
|
middlewares: [
|
||||||
|
validateAndTransformBody(AdminCancelOrderTransferRequest),
|
||||||
|
validateAndTransformQuery(
|
||||||
|
AdminGetOrdersOrderParams,
|
||||||
|
QueryConfig.retrieveTransformQueryConfig
|
||||||
|
),
|
||||||
|
],
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -106,19 +106,23 @@ export const AdminOrderCancelFulfillment = WithAdditionalData(
|
|||||||
OrderCancelFulfillment
|
OrderCancelFulfillment
|
||||||
)
|
)
|
||||||
|
|
||||||
export const AdminOrderChanges = z.object({
|
export const AdminOrderChangesParams = createSelectParams().merge(
|
||||||
|
z.object({
|
||||||
id: z.union([z.string(), z.array(z.string())]).optional(),
|
id: z.union([z.string(), z.array(z.string())]).optional(),
|
||||||
status: z.union([z.string(), z.array(z.string())]).optional(),
|
status: z.union([z.string(), z.array(z.string())]).optional(),
|
||||||
change_type: z.union([z.string(), z.array(z.string())]).optional(),
|
change_type: z.union([z.string(), z.array(z.string())]).optional(),
|
||||||
created_at: createOperatorMap().optional(),
|
created_at: createOperatorMap().optional(),
|
||||||
updated_at: createOperatorMap().optional(),
|
updated_at: createOperatorMap().optional(),
|
||||||
deleted_at: createOperatorMap().optional(),
|
deleted_at: createOperatorMap().optional(),
|
||||||
})
|
})
|
||||||
export type AdminOrderChangesType = z.infer<typeof AdminOrderChanges>
|
)
|
||||||
|
|
||||||
|
export type AdminOrderChangesType = z.infer<typeof AdminOrderChangesParams>
|
||||||
|
|
||||||
export type AdminMarkOrderFulfillmentDeliveredType = z.infer<
|
export type AdminMarkOrderFulfillmentDeliveredType = z.infer<
|
||||||
typeof AdminMarkOrderFulfillmentDelivered
|
typeof AdminMarkOrderFulfillmentDelivered
|
||||||
>
|
>
|
||||||
|
|
||||||
export const AdminMarkOrderFulfillmentDelivered = z.object({})
|
export const AdminMarkOrderFulfillmentDelivered = z.object({})
|
||||||
|
|
||||||
export type AdminTransferOrderType = z.infer<typeof AdminTransferOrder>
|
export type AdminTransferOrderType = z.infer<typeof AdminTransferOrder>
|
||||||
@@ -127,3 +131,8 @@ export const AdminTransferOrder = z.object({
|
|||||||
description: z.string().optional(),
|
description: z.string().optional(),
|
||||||
internal_note: z.string().optional(),
|
internal_note: z.string().optional(),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
export type AdminCancelOrderTransferRequestType = z.infer<
|
||||||
|
typeof AdminCancelOrderTransferRequest
|
||||||
|
>
|
||||||
|
export const AdminCancelOrderTransferRequest = z.object({})
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import {
|
||||||
|
cancelOrderTransferRequestWorkflow,
|
||||||
|
getOrderDetailWorkflow,
|
||||||
|
} from "@medusajs/core-flows"
|
||||||
|
import {
|
||||||
|
AuthenticatedMedusaRequest,
|
||||||
|
MedusaResponse,
|
||||||
|
} from "@medusajs/framework/http"
|
||||||
|
import { HttpTypes } from "@medusajs/framework/types"
|
||||||
|
import { StoreCancelOrderTransferRequestType } from "../../../validators"
|
||||||
|
|
||||||
|
export const POST = async (
|
||||||
|
req: AuthenticatedMedusaRequest<StoreCancelOrderTransferRequestType>,
|
||||||
|
res: MedusaResponse<HttpTypes.StoreOrderResponse>
|
||||||
|
) => {
|
||||||
|
const orderId = req.params.id
|
||||||
|
const customerId = req.auth_context.actor_id
|
||||||
|
|
||||||
|
await cancelOrderTransferRequestWorkflow(req.scope).run({
|
||||||
|
input: {
|
||||||
|
order_id: orderId,
|
||||||
|
logged_in_user_id: customerId,
|
||||||
|
actor_type: req.auth_context.actor_type as "customer",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const { result } = await getOrderDetailWorkflow(req.scope).run({
|
||||||
|
input: {
|
||||||
|
fields: req.remoteQueryConfig.fields,
|
||||||
|
order_id: orderId,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
res.status(200).json({ order: result as HttpTypes.StoreOrder })
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { AuthenticatedMedusaRequest, MedusaResponse } from "@medusajs/framework"
|
||||||
|
import { HttpTypes } from "@medusajs/framework/types"
|
||||||
|
import {
|
||||||
|
declineOrderTransferRequestWorkflow,
|
||||||
|
getOrderDetailWorkflow,
|
||||||
|
} from "@medusajs/core-flows"
|
||||||
|
|
||||||
|
import { StoreDeclineOrderTransferRequestType } from "../../../validators"
|
||||||
|
|
||||||
|
export const POST = async (
|
||||||
|
req: AuthenticatedMedusaRequest<StoreDeclineOrderTransferRequestType>,
|
||||||
|
res: MedusaResponse<HttpTypes.StoreOrderResponse>
|
||||||
|
) => {
|
||||||
|
await declineOrderTransferRequestWorkflow(req.scope).run({
|
||||||
|
input: {
|
||||||
|
order_id: req.params.id,
|
||||||
|
token: req.validatedBody.token,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
const { result } = await getOrderDetailWorkflow(req.scope).run({
|
||||||
|
input: {
|
||||||
|
fields: req.remoteQueryConfig.fields,
|
||||||
|
order_id: req.params.id,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
res.status(200).json({ order: result as HttpTypes.StoreOrder })
|
||||||
|
}
|
||||||
@@ -10,6 +10,8 @@ import {
|
|||||||
StoreGetOrderParams,
|
StoreGetOrderParams,
|
||||||
StoreGetOrdersParams,
|
StoreGetOrdersParams,
|
||||||
StoreRequestOrderTransfer,
|
StoreRequestOrderTransfer,
|
||||||
|
StoreCancelOrderTransferRequest,
|
||||||
|
StoreDeclineOrderTransferRequest,
|
||||||
} from "./validators"
|
} from "./validators"
|
||||||
|
|
||||||
export const storeOrderRoutesMiddlewares: MiddlewareRoute[] = [
|
export const storeOrderRoutesMiddlewares: MiddlewareRoute[] = [
|
||||||
@@ -46,6 +48,18 @@ export const storeOrderRoutesMiddlewares: MiddlewareRoute[] = [
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
method: ["POST"],
|
||||||
|
matcher: "/store/orders/:id/transfer/cancel",
|
||||||
|
middlewares: [
|
||||||
|
authenticate("customer", ["session", "bearer"]),
|
||||||
|
validateAndTransformBody(StoreCancelOrderTransferRequest),
|
||||||
|
validateAndTransformQuery(
|
||||||
|
StoreGetOrderParams,
|
||||||
|
QueryConfig.retrieveTransformQueryConfig
|
||||||
|
),
|
||||||
|
],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
method: ["POST"],
|
method: ["POST"],
|
||||||
matcher: "/store/orders/:id/transfer/accept",
|
matcher: "/store/orders/:id/transfer/accept",
|
||||||
@@ -57,4 +71,15 @@ export const storeOrderRoutesMiddlewares: MiddlewareRoute[] = [
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
method: ["POST"],
|
||||||
|
matcher: "/store/orders/:id/transfer/decline",
|
||||||
|
middlewares: [
|
||||||
|
validateAndTransformBody(StoreDeclineOrderTransferRequest),
|
||||||
|
validateAndTransformQuery(
|
||||||
|
StoreGetOrderParams,
|
||||||
|
QueryConfig.retrieveTransformQueryConfig
|
||||||
|
),
|
||||||
|
],
|
||||||
|
},
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -19,13 +19,12 @@ export const StoreGetOrdersParams = createFindParams({
|
|||||||
|
|
||||||
export type StoreGetOrdersParamsType = z.infer<typeof StoreGetOrdersParams>
|
export type StoreGetOrdersParamsType = z.infer<typeof StoreGetOrdersParams>
|
||||||
|
|
||||||
export const StoreAcceptOrderTransfer = z.object({
|
|
||||||
token: z.string().min(1),
|
|
||||||
})
|
|
||||||
|
|
||||||
export type StoreAcceptOrderTransferType = z.infer<
|
export type StoreAcceptOrderTransferType = z.infer<
|
||||||
typeof StoreAcceptOrderTransfer
|
typeof StoreAcceptOrderTransfer
|
||||||
>
|
>
|
||||||
|
export const StoreAcceptOrderTransfer = z.object({
|
||||||
|
token: z.string().min(1),
|
||||||
|
})
|
||||||
|
|
||||||
export type StoreRequestOrderTransferType = z.infer<
|
export type StoreRequestOrderTransferType = z.infer<
|
||||||
typeof StoreRequestOrderTransfer
|
typeof StoreRequestOrderTransfer
|
||||||
@@ -33,3 +32,15 @@ export type StoreRequestOrderTransferType = z.infer<
|
|||||||
export const StoreRequestOrderTransfer = z.object({
|
export const StoreRequestOrderTransfer = z.object({
|
||||||
description: z.string().optional(),
|
description: z.string().optional(),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
export type StoreCancelOrderTransferRequestType = z.infer<
|
||||||
|
typeof StoreCancelOrderTransferRequest
|
||||||
|
>
|
||||||
|
export const StoreCancelOrderTransferRequest = z.object({})
|
||||||
|
|
||||||
|
export type StoreDeclineOrderTransferRequestType = z.infer<
|
||||||
|
typeof StoreDeclineOrderTransferRequest
|
||||||
|
>
|
||||||
|
export const StoreDeclineOrderTransferRequest = z.object({
|
||||||
|
token: z.string().min(1),
|
||||||
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user