Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dashboard,core-flows,types,utils,medusa): Order cancelations will refund payments #10667

Merged
merged 17 commits into from
Jan 7, 2025
Merged

feat(dashboard,core-flows,types,utils,medusa): Order cancelations will refund payments #10667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
faac2bc
feat(order, types): Add Credit Line to order module
riqwan Dec 17, 2024
f60ff3e
Merge branch 'develop' into feat/credit-line
riqwan Dec 17, 2024
5e16844
chore: add action to inject credit lines
riqwan Dec 17, 2024
3479c89
WIP
riqwan Dec 18, 2024
27bff78
chore: merge with latest
riqwan Dec 19, 2024
c041c55
chore: add fixes + observe
riqwan Dec 19, 2024
7357d73
Merge branch 'develop' into feat/order-refund
riqwan Dec 27, 2024
d2426c5
chore: fix balances
riqwan Dec 27, 2024
574694b
chore: add canceled badge
riqwan Dec 27, 2024
f984bc0
chore: fix i18n schema
riqwan Dec 27, 2024
25b363c
chore: remove redunddant query
riqwan Dec 27, 2024
4abf68b
chore: add changeset
riqwan Dec 27, 2024
b186884
Merge branch 'develop' into feat/order-refund
riqwan Dec 27, 2024
a941af4
Merge branch 'develop' into feat/order-refund
riqwan Jan 5, 2025
9876a56
chore: add credit lines for all cancel cases
riqwan Jan 6, 2025
8a9cdb9
chore: add accounting total
riqwan Jan 6, 2025
b226570
chore: address review & cleanup
riqwan Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/tall-camels-dance.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@medusajs/dashboard": patch
"@medusajs/core-flows": patch
"@medusajs/types": patch
"@medusajs/utils": patch
"@medusajs/medusa": patch
"@medusajs/order": patch
---

feat(dashboard,core-flows,types,utils,medusa,order): Order cancelations will refund payments
193 changes: 193 additions & 0 deletions integration-tests/http/__tests__/order/admin/order.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,199 @@ medusaIntegrationTestRunner({
})
})

describe("POST /orders/:id/cancel", () => {
beforeEach(async () => {
seeder = await createOrderSeeder({
api,
container: getContainer(),
})
order = seeder.order

order = (await api.get(`/admin/orders/${order.id}`, adminHeaders)).data
.order
})

it("should successfully cancel an order and its authorized but not captured payments", async () => {
const response = await api.post(
`/admin/orders/${order.id}/cancel`,
{},
adminHeaders
)

expect(response.status).toBe(200)
expect(response.data.order).toEqual(
expect.objectContaining({
id: order.id,
status: "canceled",

summary: expect.objectContaining({
credit_line_total: 106,
current_order_total: 0,
accounting_total: 0,
}),

payment_collections: [
expect.objectContaining({
status: "canceled",
captured_amount: 0,
refunded_amount: 0,
amount: 106,
payments: [
expect.objectContaining({
canceled_at: expect.any(String),
refunds: [],
captures: [],
}),
],
}),
],
})
)
})

it("should successfully cancel an order with a captured payment", async () => {
const payment = order.payment_collections[0].payments[0]

const paymentResponse = await api.post(
`/admin/payments/${payment.id}/capture`,
undefined,
adminHeaders
)

expect(paymentResponse.data.payment).toEqual(
expect.objectContaining({
id: payment.id,
captured_at: expect.any(String),
captures: [
expect.objectContaining({
id: expect.any(String),
amount: 106,
}),
],
refunds: [],
amount: 106,
})
)

const response = await api.post(
`/admin/orders/${order.id}/cancel`,
{},
adminHeaders
)

expect(response.status).toBe(200)
expect(response.data.order).toEqual(
expect.objectContaining({
id: order.id,
status: "canceled",

summary: expect.objectContaining({
credit_line_total: 106,
current_order_total: 0,
accounting_total: 0,
}),

payment_collections: [
expect.objectContaining({
status: "canceled",
captured_amount: 106,
refunded_amount: 106,
amount: 106,
payments: [
expect.objectContaining({
// canceled_at: expect.any(String),
refunds: [
expect.objectContaining({
id: expect.any(String),
amount: 106,
}),
],
captures: [
expect.objectContaining({
id: expect.any(String),
amount: 106,
}),
],
}),
],
}),
],
})
)
})

it("should successfully cancel an order with a partially captured payment", async () => {
const payment = order.payment_collections[0].payments[0]

const paymentResponse = await api.post(
`/admin/payments/${payment.id}/capture`,
{ amount: 50 },
adminHeaders
)

expect(paymentResponse.data.payment).toEqual(
expect.objectContaining({
id: payment.id,
captured_at: null,
captures: [
expect.objectContaining({
id: expect.any(String),
amount: 50,
}),
],
refunds: [],
amount: 106,
})
)

const response = await api.post(
`/admin/orders/${order.id}/cancel`,
{},
adminHeaders
)

expect(response.status).toBe(200)
expect(response.data.order).toEqual(
expect.objectContaining({
id: order.id,
status: "canceled",

summary: expect.objectContaining({
credit_line_total: 106,
current_order_total: 0,
accounting_total: 0,
}),

payment_collections: [
expect.objectContaining({
status: "canceled",
captured_amount: 50,
refunded_amount: 50,
amount: 106,
payments: [
expect.objectContaining({
// canceled_at: expect.any(String),
refunds: [
expect.objectContaining({
id: expect.any(String),
amount: 50,
}),
],
captures: [
expect.objectContaining({
id: expect.any(String),
amount: 50,
}),
],
}),
],
}),
],
})
)
})
})

describe("POST /orders/:id/fulfillments", () => {
beforeEach(async () => {
const stockChannelOverride = (
Expand Down
Loading
Loading