asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(core-flows,order,medusa): exchange endpoints (#8396)

Browse Source
This commit is contained in:
Carlos R. L. Rodrigues
2024-08-06 06:28:27 -03:00
committed by GitHub
parent 5125d1328d
commit f415e6664c
42 changed files with 1953 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/modules/order/src/services/actions/cancel-claim.ts
View File

@@ -43,6 +43,7 @@ export async function cancelClaim(
"claim_items.is_additional_item",
"claim_items.quantity",
"additional_items.id",
"additional_items.item_id",
"additional_items.quantity",
"additional_items.is_additional_item",
],

36
packages/modules/order/src/services/actions/cancel-exchange.ts
View File

@@ -8,16 +8,16 @@ import { ChangeActionType, promiseAll } from "@medusajs/utils"
async function createOrderChange(
service,
data,
returnRef,
exchangeOrder,
actions,
sharedContext
) {
return await service.createOrderChange_(
{
order_id: returnRef.order_id,
exchange_id: returnRef.id,
reference: "return",
reference_id: returnRef.id,
order_id: exchangeOrder.order_id,
exchange_id: exchangeOrder.id,
reference: "exchange",
reference_id: exchangeOrder.id,
description: data.description,
internal_note: data.internal_note,
created_by: data.created_by,
@@ -33,40 +33,23 @@ export async function cancelExchange(
data: OrderTypes.CancelOrderExchangeDTO,
sharedContext?: Context
) {
const exchangeOrder = await this.retrieveExchange(
const exchangeOrder = await this.retrieveOrderExchange(
data.exchange_id,
{
select: [
"id",
"order_id",
"return.id",
"return.items.item_id",
"return.items.quantity",
"additional_items.id",
"additional_items.item_id",
"additional_items.quantity",
],
relations: ["return.items", "additional_items", "shipping_methods"],
relations: ["additional_items", "shipping_methods"],
},
sharedContext
)
const actions: CreateOrderChangeActionDTO[] = []
exchangeOrder.return.items.forEach((item) => {
actions.push({
action: ChangeActionType.CANCEL_RETURN_ITEM,
order_id: exchangeOrder.order_id,
exchange_id: exchangeOrder.id,
return_id: exchangeOrder.return.id,
reference: "return",
reference_id: exchangeOrder.return.id,
details: {
reference_id: item.item_id,
quantity: item.quantity,
},
})
})
exchangeOrder.additional_items.forEach((item) => {
actions.push({
action: ChangeActionType.ITEM_REMOVE,
@@ -88,7 +71,6 @@ export async function cancelExchange(
action: ChangeActionType.SHIPPING_REMOVE,
order_id: exchangeOrder.order_id,
exchange_id: exchangeOrder.id,
return_id: exchangeOrder.return.id,
reference: "exchange",
reference_id: shipping.id,
amount: shipping.price,
@@ -104,7 +86,7 @@ export async function cancelExchange(
)
await promiseAll([
this.updateExchanges(
this.updateOrderExchanges(
[
{
data: {

2
packages/modules/order/src/services/actions/create-claim.ts
View File

@@ -125,6 +125,7 @@ async function processAdditionalItems(
details: {
reference_id: item.id,
quantity: item.quantity,
unit_price: item.unit_price ?? hasItem.item.unit_price,
metadata: item.metadata,
},
})
@@ -144,6 +145,7 @@ async function processAdditionalItems(
additionalNewItems.push(
em.create(OrderClaimItem, {
quantity: item.quantity,
unit_price: item.unit_price,
note: item.note,
metadata: item.metadata,
is_additional_item: true,

2
packages/modules/order/src/services/actions/create-exchange.ts
View File

@@ -92,6 +92,7 @@ async function processAdditionalItems(
details: {
reference_id: item.id,
quantity: item.quantity,
unit_price: item.unit_price ?? hasItem.item.unit_price,
metadata: item.metadata,
},
})
@@ -111,6 +112,7 @@ async function processAdditionalItems(
additionalNewItems.push(
em.create(OrderExchangeItem, {
quantity: item.quantity,
unit_price: item.unit_price,
note: item.note,
metadata: item.metadata,
is_additional_item: true,

4
packages/modules/order/src/services/order-module-service.ts
View File

@@ -3206,7 +3206,7 @@ export default class OrderModuleService<
const ret = await this.cancelClaim_(data, sharedContext)
return await this.retrieveOrderClaim(ret.id, {
relations: ["additional_items", "claim_items"],
relations: ["additional_items", "claim_items", "return", "return.items"],
})
}
@@ -3266,7 +3266,7 @@ export default class OrderModuleService<
const ret = await this.cancelExchange_(data, sharedContext)
return await this.retrieveOrderExchange(ret.id, {
relations: ["items"],
relations: ["additional_items", "return", "return.items"],
})
}

9
packages/modules/order/src/utils/actions/cancel-item-fulfillment.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -26,7 +21,7 @@ OrderChangeProcessing.registerActionType(
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Reference ID is required."

18
packages/modules/order/src/utils/actions/cancel-return.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -22,24 +17,17 @@ OrderChangeProcessing.registerActionType(ChangeActionType.CANCEL_RETURN_ITEM, {
setActionReference(existing, action, options)
return action.details.unit_price * action.details.quantity
return MathBN.mult(existing.unit_price, action.details.quantity)
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Details reference ID is required."
)
}
if (!isDefined(action.amount) && !isDefined(action.details?.unit_price)) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
`Unit price of item ${action.reference_id} is required if no action.amount is provided.`
)
}
const existing = currentOrder.items.find((item) => item.id === refId)
if (!existing) {

9
packages/modules/order/src/utils/actions/fulfill-item.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -24,7 +19,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.FULFILL_ITEM, {
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Reference ID is required."

9
packages/modules/order/src/utils/actions/item-add.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { VirtualOrder } from "@types"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -45,7 +40,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.ITEM_ADD, {
validate({ action }) {
const refId = action.details?.reference_id
if (!isDefined(action.amount) && !isDefined(action.details?.unit_price)) {
if (action.amount == null && action.details?.unit_price == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
`Unit price of item ${refId} is required if no action.amount is provided.`

16
packages/modules/order/src/utils/actions/item-remove.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -34,7 +29,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.ITEM_REMOVE, {
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Reference ID is required."
@@ -49,13 +44,6 @@ OrderChangeProcessing.registerActionType(ChangeActionType.ITEM_REMOVE, {
)
}
if (!isDefined(action.amount) && !isDefined(action.details?.unit_price)) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
`Unit price of item ${refId} is required if no action.amount is provided.`
)
}
if (!action.details?.quantity) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,

9
packages/modules/order/src/utils/actions/receive-damaged-return-item.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -42,7 +37,7 @@ OrderChangeProcessing.registerActionType(
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Details reference ID is required."

9
packages/modules/order/src/utils/actions/receive-return-item.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -34,7 +29,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.RECEIVE_RETURN_ITEM, {
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Details reference ID is required."

9
packages/modules/order/src/utils/actions/reinstate-item.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -23,7 +18,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.REINSTATE_ITEM, {
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Details reference ID is required."

9
packages/modules/order/src/utils/actions/return-item.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -27,7 +22,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.RETURN_ITEM, {
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Details reference ID is required."

9
packages/modules/order/src/utils/actions/ship-item.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -24,7 +19,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.SHIP_ITEM, {
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Reference ID is required."

4
packages/modules/order/src/utils/actions/shipping-add.ts
View File

@@ -1,4 +1,4 @@
import { ChangeActionType, MedusaError, isDefined } from "@medusajs/utils"
import { ChangeActionType, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -33,7 +33,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.SHIPPING_ADD, {
)
}
if (!isDefined(action.amount)) {
if (action.amount == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Amount is required."

9
packages/modules/order/src/utils/actions/shipping-remove.ts
View File

@@ -1,4 +1,4 @@
import { ChangeActionType, MedusaError, isDefined } from "@medusajs/utils"
import { ChangeActionType, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
OrderChangeProcessing.registerActionType(ChangeActionType.SHIPPING_REMOVE, {
@@ -24,12 +24,5 @@ OrderChangeProcessing.registerActionType(ChangeActionType.SHIPPING_REMOVE, {
"Reference ID is required."
)
}
if (!isDefined(action.amount)) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Amount is required."
)
}
},
})

9
packages/modules/order/src/utils/actions/write-off-item.ts
View File

@@ -1,9 +1,4 @@
import {
ChangeActionType,
MathBN,
MedusaError,
isDefined,
} from "@medusajs/utils"
import { ChangeActionType, MathBN, MedusaError } from "@medusajs/utils"
import { OrderChangeProcessing } from "../calculate-order-change"
import { setActionReference } from "../set-action-reference"
@@ -23,7 +18,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.WRITE_OFF_ITEM, {
},
validate({ action, currentOrder }) {
const refId = action.details?.reference_id
if (!isDefined(refId)) {
if (refId == null) {
throw new MedusaError(
MedusaError.Types.INVALID_DATA,
"Details reference ID is required."