feat(order): receive return and additional calculations (#7314)
This commit is contained in:
Carlos R. L. Rodrigues
committed by
GitHub
GitHub
parent
d680c7ee4c
commit
4ef70d37bf
@@ -96,14 +96,14 @@ describe("Order Exchange - Actions", function () {
|
||||
|
||||
const sumToJSON = JSON.parse(JSON.stringify(changes.summary))
|
||||
expect(sumToJSON).toEqual({
|
||||
transactionTotal: 0,
|
||||
originalOrderTotal: 270,
|
||||
currentOrderTotal: 312.5,
|
||||
temporaryDifference: 62.5,
|
||||
futureDifference: 0,
|
||||
futureTemporaryDifference: 0,
|
||||
pendingDifference: 312.5,
|
||||
differenceSum: 42.5,
|
||||
transaction_total: 0,
|
||||
original_order_total: 270,
|
||||
current_order_total: 312.5,
|
||||
temporary_difference: 62.5,
|
||||
future_difference: 0,
|
||||
future_temporary_difference: 0,
|
||||
pending_difference: 312.5,
|
||||
difference_sum: 42.5,
|
||||
})
|
||||
|
||||
const toJson = JSON.parse(JSON.stringify(changes.order.items))
|
||||
|
||||
@@ -2238,8 +2238,8 @@ export default class OrderModuleService<
|
||||
return {
|
||||
action: ChangeActionType.RETURN_ITEM,
|
||||
internal_note: item.internal_note,
|
||||
reference: data.reference,
|
||||
reference_id: shippingMethodId,
|
||||
reference: data.reference ?? "fulfillment",
|
||||
reference_id: data.reference_id ?? shippingMethodId,
|
||||
details: {
|
||||
reference_id: item.id,
|
||||
quantity: item.quantity,
|
||||
@@ -2251,8 +2251,8 @@ export default class OrderModuleService<
|
||||
if (shippingMethodId) {
|
||||
actions.push({
|
||||
action: ChangeActionType.SHIPPING_ADD,
|
||||
reference: data.reference,
|
||||
reference_id: shippingMethodId,
|
||||
reference: data.reference ?? "fulfillment",
|
||||
reference_id: data.reference_id ?? shippingMethodId,
|
||||
amount: calculatedAmount.total,
|
||||
})
|
||||
}
|
||||
@@ -2544,4 +2544,37 @@ export default class OrderModuleService<
|
||||
|
||||
return await this.returnReasonService_.update(toUpdate, sharedContext)
|
||||
}
|
||||
|
||||
public async receiveReturn(
|
||||
data: OrderTypes.ReceiveOrderReturnDTO,
|
||||
sharedContext?: Context
|
||||
): Promise<void> {
|
||||
const items = data.items.map((item) => {
|
||||
return {
|
||||
action: ChangeActionType.RECEIVE_RETURN_ITEM,
|
||||
internal_note: item.internal_note,
|
||||
reference: data.reference,
|
||||
reference_id: data.reference_id,
|
||||
details: {
|
||||
reference_id: item.id,
|
||||
quantity: item.quantity,
|
||||
metadata: item.metadata,
|
||||
},
|
||||
}
|
||||
})
|
||||
|
||||
const change = await this.createOrderChange_(
|
||||
{
|
||||
order_id: data.order_id,
|
||||
description: data.description,
|
||||
internal_note: data.internal_note,
|
||||
created_by: data.created_by,
|
||||
metadata: data.metadata,
|
||||
actions: items,
|
||||
},
|
||||
sharedContext
|
||||
)
|
||||
|
||||
await this.confirmOrderChange(change[0].id, sharedContext)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,14 +36,14 @@ export enum EVENT_STATUS {
|
||||
}
|
||||
|
||||
export interface OrderSummaryCalculated {
|
||||
currentOrderTotal: BigNumberInput
|
||||
originalOrderTotal: BigNumberInput
|
||||
transactionTotal: BigNumberInput
|
||||
futureDifference: BigNumberInput
|
||||
pendingDifference: BigNumberInput
|
||||
futureTemporaryDifference: BigNumberInput
|
||||
temporaryDifference: BigNumberInput
|
||||
differenceSum: BigNumberInput
|
||||
current_order_total: BigNumberInput
|
||||
original_order_total: BigNumberInput
|
||||
transaction_total: BigNumberInput
|
||||
future_difference: BigNumberInput
|
||||
pending_difference: BigNumberInput
|
||||
future_temporary_difference: BigNumberInput
|
||||
temporary_difference: BigNumberInput
|
||||
difference_sum: BigNumberInput
|
||||
}
|
||||
|
||||
export interface OrderTransaction {
|
||||
|
||||
@@ -15,8 +15,8 @@ import {
|
||||
VirtualOrder,
|
||||
} from "@types"
|
||||
|
||||
type InternalOrderSummary = OrderSummaryCalculated & {
|
||||
futureTemporarySum: BigNumberInput
|
||||
interface InternalOrderSummary extends OrderSummaryCalculated {
|
||||
future_temporary_sum: BigNumberInput
|
||||
}
|
||||
|
||||
export class OrderChangeProcessing {
|
||||
@@ -56,15 +56,15 @@ export class OrderChangeProcessing {
|
||||
transformPropertiesToBigNumber(this.order.metadata)
|
||||
|
||||
this.summary = {
|
||||
futureDifference: 0,
|
||||
futureTemporaryDifference: 0,
|
||||
temporaryDifference: 0,
|
||||
pendingDifference: 0,
|
||||
futureTemporarySum: 0,
|
||||
differenceSum: 0,
|
||||
currentOrderTotal: this.order.total ?? 0,
|
||||
originalOrderTotal: this.order.total ?? 0,
|
||||
transactionTotal,
|
||||
future_difference: 0,
|
||||
future_temporary_difference: 0,
|
||||
temporary_difference: 0,
|
||||
pending_difference: 0,
|
||||
future_temporary_sum: 0,
|
||||
difference_sum: 0,
|
||||
current_order_total: this.order.total ?? 0,
|
||||
original_order_total: this.order.total ?? 0,
|
||||
transaction_total: transactionTotal,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -114,26 +114,29 @@ export class OrderChangeProcessing {
|
||||
|
||||
if (type.awaitRequired && !this.isEventDone(action)) {
|
||||
if (action.evaluationOnly) {
|
||||
summary.futureTemporarySum = MathBN.add(
|
||||
summary.futureTemporarySum,
|
||||
summary.future_temporary_sum = MathBN.add(
|
||||
summary.future_temporary_sum,
|
||||
amount
|
||||
)
|
||||
} else {
|
||||
summary.temporaryDifference = MathBN.add(
|
||||
summary.temporaryDifference,
|
||||
summary.temporary_difference = MathBN.add(
|
||||
summary.temporary_difference,
|
||||
amount
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if (action.evaluationOnly) {
|
||||
summary.futureDifference = MathBN.add(summary.futureDifference, amount)
|
||||
summary.future_difference = MathBN.add(
|
||||
summary.future_difference,
|
||||
amount
|
||||
)
|
||||
} else {
|
||||
if (!this.isEventDone(action) && !action.group_id) {
|
||||
summary.differenceSum = MathBN.add(summary.differenceSum, amount)
|
||||
summary.difference_sum = MathBN.add(summary.difference_sum, amount)
|
||||
}
|
||||
summary.currentOrderTotal = MathBN.add(
|
||||
summary.currentOrderTotal,
|
||||
summary.current_order_total = MathBN.add(
|
||||
summary.current_order_total,
|
||||
amount
|
||||
)
|
||||
}
|
||||
@@ -141,25 +144,25 @@ export class OrderChangeProcessing {
|
||||
|
||||
const groupSum = MathBN.add(...Object.values(this.groupTotal))
|
||||
|
||||
summary.differenceSum = MathBN.add(summary.differenceSum, groupSum)
|
||||
summary.difference_sum = MathBN.add(summary.difference_sum, groupSum)
|
||||
|
||||
summary.transactionTotal = MathBN.sum(
|
||||
summary.transaction_total = MathBN.sum(
|
||||
...this.transactions.map((tr) => tr.amount)
|
||||
)
|
||||
|
||||
summary.futureTemporaryDifference = MathBN.sub(
|
||||
summary.futureDifference,
|
||||
summary.futureTemporarySum
|
||||
summary.future_temporary_difference = MathBN.sub(
|
||||
summary.future_difference,
|
||||
summary.future_temporary_sum
|
||||
)
|
||||
|
||||
summary.temporaryDifference = MathBN.sub(
|
||||
summary.differenceSum,
|
||||
summary.temporaryDifference
|
||||
summary.temporary_difference = MathBN.sub(
|
||||
summary.difference_sum,
|
||||
summary.temporary_difference
|
||||
)
|
||||
|
||||
summary.pendingDifference = MathBN.sub(
|
||||
summary.currentOrderTotal,
|
||||
summary.transactionTotal
|
||||
summary.pending_difference = MathBN.sub(
|
||||
summary.current_order_total,
|
||||
summary.transaction_total
|
||||
)
|
||||
}
|
||||
|
||||
@@ -345,46 +348,18 @@ export class OrderChangeProcessing {
|
||||
public getSummary(): OrderSummaryDTO {
|
||||
const summary = this.summary
|
||||
const orderSummary = {
|
||||
transactionTotal: new BigNumber(summary.transactionTotal),
|
||||
originalOrderTotal: new BigNumber(summary.originalOrderTotal),
|
||||
currentOrderTotal: new BigNumber(summary.currentOrderTotal),
|
||||
temporaryDifference: new BigNumber(summary.temporaryDifference),
|
||||
futureDifference: new BigNumber(summary.futureDifference),
|
||||
futureTemporaryDifference: new BigNumber(
|
||||
summary.futureTemporaryDifference
|
||||
transaction_total: new BigNumber(summary.transaction_total),
|
||||
original_order_total: new BigNumber(summary.original_order_total),
|
||||
current_order_total: new BigNumber(summary.current_order_total),
|
||||
temporary_difference: new BigNumber(summary.temporary_difference),
|
||||
future_difference: new BigNumber(summary.future_difference),
|
||||
future_temporary_difference: new BigNumber(
|
||||
summary.future_temporary_difference
|
||||
),
|
||||
pendingDifference: new BigNumber(summary.pendingDifference),
|
||||
differenceSum: new BigNumber(summary.differenceSum),
|
||||
pending_difference: new BigNumber(summary.pending_difference),
|
||||
difference_sum: new BigNumber(summary.difference_sum),
|
||||
} as unknown as OrderSummaryDTO
|
||||
|
||||
/*
|
||||
{
|
||||
total: summary.currentOrderTotal
|
||||
|
||||
subtotal: number
|
||||
total_tax: number
|
||||
|
||||
ordered_total: summary.originalOrderTotal
|
||||
fulfilled_total: number
|
||||
returned_total: number
|
||||
return_request_total: number
|
||||
write_off_total: number
|
||||
projected_total: number
|
||||
|
||||
net_total: number
|
||||
net_subtotal: number
|
||||
net_total_tax: number
|
||||
|
||||
future_total: number
|
||||
future_subtotal: number
|
||||
future_total_tax: number
|
||||
future_projected_total: number
|
||||
|
||||
balance: summary.pendingDifference
|
||||
future_balance: number
|
||||
}
|
||||
*/
|
||||
|
||||
return orderSummary
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user