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

chore: add compare_at_unit_price when price list price is retrieved (#9564)

Browse Source 
* chore: add compare_at_unit_price when price list price is retrieved

* chore: add test for update item + more fixes along the way

* chore: fix tests

* chore: add refresh spec

* Apply suggestions from code review

Co-authored-by: Adrien de Peretti <adrien.deperetti@gmail.com>

* chore: use undefined checker

* chore: switch to map

---------

Co-authored-by: Adrien de Peretti <adrien.deperetti@gmail.com>
This commit is contained in:
Riqwan Thamir
2024-10-15 13:05:14 +02:00
committed by GitHub
parent 827b32cffd
commit 537567b679
31 changed files with 2161 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/http/__tests__/cart/store/cart.spec.ts
+1230 -200
View File
File diff suppressed because it is too large Load Diff
integration-tests/http/__tests__/order-edits/order-edits.spec.ts
+39 -5
View File
@@ -369,22 +369,56 @@ medusaIntegrationTestRunner({
expect(result.summary.current_order_total).toEqual(84)
expect(result.summary.original_order_total).toEqual(60)
// Update item quantity
// Update item quantity and unit_price with the same amount as we have originally should not change totals
result = (
await api.post(
`/admin/order-edits/${orderId}/items/item/${item.id}`,
{
quantity: 4,
quantity: 2,
unit_price: 25,
},
adminHeaders
)
).data.order_preview
expect(result.summary.current_order_total).toEqual(134)
expect(result.summary.current_order_total).toEqual(84)
expect(result.summary.original_order_total).toEqual(60)
// Update item quantity, but keep the price as it was originally, should add + 25 to previous amount
result = (
await api.post(
`/admin/order-edits/${orderId}/items/item/${item.id}`,
{
quantity: 3,
unit_price: 25,
},
adminHeaders
)
).data.order_preview
expect(result.summary.current_order_total).toEqual(109)
expect(result.summary.original_order_total).toEqual(60)
// Update item quantity, with a new price
// 30 * 3 = 90 (new item)
// 12 * 2 = 24 (custom item)
// 10 * 1 = 10 (shipping item)
// total = 124
result = (
await api.post(
`/admin/order-edits/${orderId}/items/item/${item.id}`,
{
quantity: 3,
unit_price: 30,
},
adminHeaders
)
).data.order_preview
expect(result.summary.current_order_total).toEqual(124)
expect(result.summary.original_order_total).toEqual(60)
// Remove the item by setting the quantity to 0
result = (
await api.post(
`/admin/order-edits/${orderId}/items/item/${item.id}`,
@@ -439,7 +473,7 @@ medusaIntegrationTestRunner({
)
).data.order_changes
expect(result[0].actions).toHaveLength(3)
expect(result[0].actions).toHaveLength(5)
expect(result[0].status).toEqual("confirmed")
expect(result[0].confirmed_by).toEqual(expect.stringContaining("user_"))
})
integration-tests/modules/__tests__/cart/store/carts.spec.ts
-1287
View File
File diff suppressed because it is too large Load Diff
packages/core/core-flows/src/cart/steps/get-line-item-actions.ts
+5 -2
View File
@@ -48,8 +48,8 @@ export const getLineItemActionsStep = createStep(
if (existingItem && metadataMatches) {
const quantity = MathBN.sum(
existingItem.quantity as number,
item.quantity || 1
).toNumber()
item.quantity ?? 1
)
itemsToUpdate.push({
selector: { id: existingItem.id },
@@ -57,6 +57,9 @@ export const getLineItemActionsStep = createStep(
id: existingItem.id,
quantity: quantity,
variant_id: item.variant_id!,
unit_price: item.unit_price ?? existingItem.unit_price,
compare_at_unit_price:
item.compare_at_unit_price ?? existingItem.compare_at_unit_price,
},
})
} else {
packages/core/core-flows/src/cart/utils/fields.ts
+5 -2
View File
@@ -1,10 +1,13 @@
export const cartFieldsForRefreshSteps = [
"id",
"currency_code",
"quantity",
"subtotal",
"item_subtotal",
"shipping_subtotal",
"region_id",
"currency_code",
"metadata",
"completed_at",
"region.*",
"items.*",
@@ -20,6 +23,7 @@ export const cartFieldsForRefreshSteps = [
"shipping_methods.tax_lines.*",
"customer.*",
"customer.groups.*",
"promotions.code",
]
export const completeCartFields = [
@@ -113,8 +117,7 @@ export const productVariantsFields = [
"product.collection.title",
"product.handle",
"product.discountable",
"calculated_price.calculated_amount",
"calculated_price.is_calculated_price_tax_inclusive",
"calculated_price.*",
"inventory_items.inventory_item_id",
"inventory_items.required_quantity",
"inventory_items.inventory.requires_shipping",
packages/core/core-flows/src/cart/utils/prepare-line-item-data.ts
+25 -1
View File
@@ -6,16 +6,24 @@ import {
InventoryItemDTO,
ProductVariantDTO,
} from "@medusajs/framework/types"
import { isDefined } from "@medusajs/framework/utils"
import { isDefined, MathBN, PriceListType } from "@medusajs/framework/utils"
interface Input {
item?: CartLineItemDTO
quantity: BigNumberInput
metadata?: Record<string, any>
unitPrice: BigNumberInput
compareAtUnitPrice?: BigNumberInput | null
isTaxInclusive?: boolean
variant: ProductVariantDTO & {
inventory_items: { inventory: InventoryItemDTO }[]
calculated_price: {
calculated_price: {
price_list_type: string
}
original_amount: BigNumberInput
calculated_amount: BigNumberInput
}
}
taxLines?: CreateOrderLineItemTaxLineDTO[]
adjustments?: CreateOrderAdjustmentDTO[]
@@ -39,6 +47,20 @@ export function prepareLineItemData(data: Input) {
throw new Error("Variant does not have a product")
}
let compareAtUnitPrice = data.compareAtUnitPrice
if (
!isDefined(compareAtUnitPrice) &&
variant.calculated_price.calculated_price.price_list_type ===
PriceListType.SALE &&
!MathBN.eq(
variant.calculated_price.original_amount,
variant.calculated_price.calculated_amount
)
) {
compareAtUnitPrice = variant.calculated_price.original_amount
}
// Note: If any of the items require shipping, we enable fulfillment
// unless explicitly set to not require shipping by the item in the request
const { inventory_items: inventoryItems } = variant
@@ -78,7 +100,9 @@ export function prepareLineItemData(data: Input) {
requires_shipping: requiresShipping,
unit_price: unitPrice,
compare_at_unit_price: compareAtUnitPrice,
is_tax_inclusive: !!isTaxInclusive,
metadata,
}
packages/core/core-flows/src/cart/workflows/complete-cart.ts
+12 -11
View File
@@ -1,6 +1,6 @@
import {
CartWorkflowDTO,
UsageComputedActions
UsageComputedActions,
} from "@medusajs/framework/types"
import {
Modules,
@@ -85,20 +85,19 @@ export const completeCartWorkflow = createWorkflow(
})
const { variants, sales_channel_id } = transform({ cart }, (data) => {
const allItems: any[] = []
const allVariants: any[] = []
const variantsMap: Record<string, any> = {}
const allItems = data.cart?.items?.map((item) => {
variantsMap[item.variant_id] = item.variant
data.cart?.items?.forEach((item) => {
allItems.push({
id: item.id,
variant_id: item.variant_id,
quantity: item.quantity,
return {
id: item.id,
variant_id: item.variant_id,
quantity: item.quantity,
}
})
allVariants.push(item.variant)
})
return {
variants: allVariants,
variants: Object.values(variantsMap),
items: allItems,
sales_channel_id: data.cart.sales_channel_id,
}
@@ -110,6 +109,8 @@ export const completeCartWorkflow = createWorkflow(
item,
variant: item.variant,
unitPrice: item.raw_unit_price ?? item.unit_price,
compareAtUnitPrice:
item.raw_compare_at_unit_price ?? item.compare_at_unit_price,
isTaxInclusive: item.is_tax_inclusive,
quantity: item.raw_quantity ?? item.quantity,
metadata: item?.metadata,
packages/core/core-flows/src/cart/workflows/refresh-cart-items.ts
+131
View File
@@ -0,0 +1,131 @@
import { isDefined, PromotionActions } from "@medusajs/framework/utils"
import {
createWorkflow,
transform,
WorkflowData,
WorkflowResponse,
} from "@medusajs/framework/workflows-sdk"
import { useRemoteQueryStep } from "../../common/steps/use-remote-query"
import { refreshCartShippingMethodsStep, updateLineItemsStep } from "../steps"
import { validateVariantPricesStep } from "../steps/validate-variant-prices"
import {
cartFieldsForRefreshSteps,
productVariantsFields,
} from "../utils/fields"
import { prepareLineItemData } from "../utils/prepare-line-item-data"
import { refreshPaymentCollectionForCartWorkflow } from "./refresh-payment-collection"
import { updateCartPromotionsWorkflow } from "./update-cart-promotions"
import { updateTaxLinesWorkflow } from "./update-tax-lines"
export const refreshCartItemsWorkflowId = "refresh-cart-items"
/**
* This workflow refreshes a cart's items
*/
export const refreshCartItemsWorkflow = createWorkflow(
refreshCartItemsWorkflowId,
(
input: WorkflowData<{
cart_id: string
promo_codes?: string[]
}>
) => {
const cart = useRemoteQueryStep({
entry_point: "cart",
fields: cartFieldsForRefreshSteps,
variables: { id: input.cart_id },
list: false,
})
const variantIds = transform({ cart }, (data) => {
return (data.cart.items ?? []).map((i) => i.variant_id)
})
const pricingContext = transform(
{ cart },
({ cart: { currency_code, region_id, customer_id } }) => {
return {
currency_code,
region_id,
customer_id,
}
}
)
const variants = useRemoteQueryStep({
entry_point: "variants",
fields: productVariantsFields,
variables: {
id: variantIds,
calculated_price: {
context: pricingContext,
},
},
throw_if_key_not_found: true,
}).config({ name: "fetch-variants" })
validateVariantPricesStep({ variants })
const lineItems = transform({ cart, variants }, ({ cart, variants }) => {
const items = cart.items.map((item) => {
const variant = variants.find((v) => v.id === item.variant_id)!
const preparedItem = prepareLineItemData({
variant: variant,
unitPrice: variant.calculated_price.calculated_amount,
isTaxInclusive:
variant.calculated_price.is_calculated_price_tax_inclusive,
quantity: item.quantity,
metadata: item.metadata,
cartId: cart.id,
})
return {
selector: { id: item.id },
data: preparedItem,
}
})
return items
})
const items = updateLineItemsStep({
id: cart.id,
items: lineItems,
})
const refetchedCart = useRemoteQueryStep({
entry_point: "cart",
fields: cartFieldsForRefreshSteps,
variables: { id: cart.id },
list: false,
}).config({ name: "refetch–cart" })
refreshCartShippingMethodsStep({ cart: refetchedCart })
updateTaxLinesWorkflow.runAsStep({
input: { cart_id: cart.id, items },
})
const cartPromoCodes = transform({ cart, input }, ({ cart, input }) => {
if (isDefined(input.promo_codes)) {
return input.promo_codes
} else {
return cart.promotions.map((p) => p.code)
}
})
updateCartPromotionsWorkflow.runAsStep({
input: {
cart_id: cart.id,
promo_codes: cartPromoCodes,
action: PromotionActions.REPLACE,
},
})
refreshPaymentCollectionForCartWorkflow.runAsStep({
input: { cart_id: cart.id },
})
return new WorkflowResponse(refetchedCart)
}
)
packages/core/core-flows/src/cart/workflows/update-cart.ts
+5 -34
View File
@@ -2,7 +2,7 @@ import {
AdditionalData,
UpdateCartWorkflowInputDTO,
} from "@medusajs/framework/types"
import { MedusaError, PromotionActions } from "@medusajs/framework/utils"
import { MedusaError } from "@medusajs/framework/utils"
import {
createHook,
createWorkflow,
@@ -16,13 +16,9 @@ import { useRemoteQueryStep } from "../../common"
import {
findOrCreateCustomerStep,
findSalesChannelStep,
refreshCartShippingMethodsStep,
updateCartsStep,
} from "../steps"
import { cartFieldsForRefreshSteps } from "../utils/fields"
import { refreshPaymentCollectionForCartWorkflow } from "./refresh-payment-collection"
import { updateCartPromotionsWorkflow } from "./update-cart-promotions"
import { updateTaxLinesWorkflow } from "./update-tax-lines"
import { refreshCartItemsWorkflow } from "./refresh-cart-items"
export const updateCartWorkflowId = "update-cart"
/**
@@ -133,35 +129,10 @@ export const updateCartWorkflow = createWorkflow(
}
)
const carts = updateCartsStep([cartInput])
updateCartsStep([cartInput])
const cart = useRemoteQueryStep({
entry_point: "cart",
fields: cartFieldsForRefreshSteps,
variables: { id: cartInput.id },
list: false,
}).config({ name: "refetch–cart" })
refreshCartShippingMethodsStep({ cart })
updateTaxLinesWorkflow.runAsStep({
input: {
cart_id: carts[0].id,
},
})
updateCartPromotionsWorkflow.runAsStep({
input: {
cart_id: input.id,
promo_codes: input.promo_codes,
action: PromotionActions.REPLACE,
},
})
refreshPaymentCollectionForCartWorkflow.runAsStep({
input: {
cart_id: input.id,
},
const cart = refreshCartItemsWorkflow.runAsStep({
input: { cart_id: cartInput.id, promo_codes: input.promo_codes },
})
const cartUpdated = createHook("cartUpdated", {
packages/core/core-flows/src/order/utils/fields.ts
+1 -1
View File
@@ -13,7 +13,7 @@ export const productVariantsFields = [
"product.type.value",
"product.collection.title",
"product.handle",
"calculated_price.calculated_amount",
"calculated_price.*",
"inventory_items.inventory_item_id",
"inventory_items.required_quantity",
"inventory_items.inventory.requires_shipping",
packages/core/core-flows/src/order/workflows/order-edit/confirm-order-edit-request.ts
+5
View File
@@ -171,6 +171,10 @@ export const confirmOrderEditRequestWorkflow = createWorkflow(
const unitPrice: BigNumberInput =
itemAction.raw_unit_price ?? itemAction.unit_price
const compareAtUnitPrice: BigNumberInput | undefined =
itemAction.raw_compare_at_unit_price ??
itemAction.compare_at_unit_price
const updateAction = itemAction.actions!.find(
(a) => a.action === ChangeActionType.ITEM_UPDATE
)
@@ -196,6 +200,7 @@ export const confirmOrderEditRequestWorkflow = createWorkflow(
variant_id: ordItem.variant_id,
quantity: reservationQuantity,
unit_price: unitPrice,
compare_at_unit_price: compareAtUnitPrice,
})
allVariants.push(ordItem.variant)
})
packages/core/core-flows/src/order/workflows/order-edit/order-edit-add-new-item.ts
+3
View File
@@ -104,6 +104,9 @@ export const orderEditAddNewItemWorkflow = createWorkflow(
reference_id: lineItems[index].id,
quantity: item.quantity,
unit_price: item.unit_price ?? lineItems[index].unit_price,
compare_at_unit_price:
item.compare_at_unit_price ??
lineItems[index].compare_at_unit_price,
metadata: item.metadata,
},
}))
packages/core/core-flows/src/order/workflows/order-edit/order-edit-update-item-quantity.ts
+1
View File
@@ -85,6 +85,7 @@ export const orderEditUpdateItemQuantityWorkflow = createWorkflow(
reference_id: item.id,
quantity: item.quantity,
unit_price: item.unit_price,
compare_at_unit_price: item.compare_at_unit_price,
},
}))
}
packages/core/core-flows/src/order/workflows/order-edit/update-order-edit-add-item.ts
+3
View File
@@ -105,6 +105,9 @@ export const updateOrderEditAddItemWorkflow = createWorkflow(
details: {
quantity: data.quantity ?? originalAction.details?.quantity,
unit_price: data.unit_price ?? originalAction.details?.unit_price,
compare_at_unit_price:
data.compare_at_unit_price ??
originalAction.details?.compare_at_unit_price,
},
internal_note: data.internal_note,
}
packages/core/types/src/http/cart/store/payloads.ts
+1
View File
@@ -6,6 +6,7 @@ export interface StoreCreateCart {
currency_code?: string
items?: StoreAddCartLineItem[]
sales_channel_id?: string
promo_codes?: string[]
metadata?: Record<string, unknown>
}
packages/core/types/src/workflow/order/items.ts
+6 -3
View File
@@ -4,7 +4,8 @@ import { BigNumberInput } from "../../totals"
interface NewItem {
variant_id: string
quantity: BigNumberInput
unit_price?: BigNumberInput
unit_price?: BigNumberInput | null
compare_at_unit_price?: BigNumberInput | null
internal_note?: string | null
metadata?: Record<string, any> | null
}
@@ -12,7 +13,8 @@ interface NewItem {
interface ExistingItem {
id: string
quantity: BigNumberInput
unit_price?: BigNumberInput
unit_price?: BigNumberInput | null
compare_at_unit_price?: BigNumberInput | null
internal_note?: string | null
}
@@ -60,7 +62,8 @@ export interface UpdateOrderEditAddNewItemWorkflowInput {
action_id: string
data: {
quantity?: BigNumberInput
unit_price?: BigNumberInput
unit_price?: BigNumberInput | null
compare_at_unit_price?: BigNumberInput | null
internal_note?: string | null
}
}
packages/medusa/src/api/admin/order-edits/validators.ts
+7 -4
View File
@@ -37,8 +37,9 @@ export const AdminPostOrderEditsAddItemsReqSchema = z.object({
z.object({
variant_id: z.string(),
quantity: z.number(),
unit_price: z.number().optional(),
internal_note: z.string().optional(),
unit_price: z.number().nullish(),
compare_at_unit_price: z.number().nullish(),
internal_note: z.string().nullish(),
allow_backorder: z.boolean().optional(),
metadata: z.record(z.unknown()).optional(),
})
@@ -51,7 +52,8 @@ export type AdminPostOrderEditsAddItemsReqSchemaType = z.infer<
export const AdminPostOrderEditsItemsActionReqSchema = z.object({
quantity: z.number().optional(),
unit_price: z.number().optional(),
unit_price: z.number().nullish(),
compare_at_unit_price: z.number().nullish(),
internal_note: z.string().nullish().optional(),
})
@@ -61,7 +63,8 @@ export type AdminPostOrderEditsItemsActionReqSchemaType = z.infer<
export const AdminPostOrderEditsUpdateItemQuantityReqSchema = z.object({
quantity: z.number(),
unit_price: z.number().optional(),
unit_price: z.number().nullish(),
compare_at_unit_price: z.number().nullish(),
internal_note: z.string().nullish().optional(),
})
packages/medusa/src/api/store/carts/query-config.ts
+1
View File
@@ -57,6 +57,7 @@ export const defaultStoreCartFields = [
"items.title",
"items.quantity",
"items.unit_price",
"items.compare_at_unit_price",
"items.is_tax_inclusive",
"items.tax_lines.id",
"items.tax_lines.description",
packages/medusa/src/api/store/carts/validators.ts
+2 -1
View File
@@ -21,6 +21,7 @@ export const CreateCart = z
currency_code: z.string().nullish(),
items: z.array(ItemSchema).optional(),
sales_channel_id: z.string().nullish(),
promo_codes: z.array(z.string()).optional(),
metadata: z.record(z.unknown()).nullish(),
})
.strict()
@@ -45,7 +46,7 @@ export const StoreRemoveCartPromotions = z
export type StoreUpdateCartType = z.infer<typeof UpdateCart>
export const UpdateCart = z
.object({
region_id: z.string().nullish(),
region_id: z.string().optional(),
email: z.string().email().nullish(),
billing_address: z.union([AddressPayload, z.string()]).optional(),
shipping_address: z.union([AddressPayload, z.string()]).optional(),
packages/modules/order/src/migrations/.snapshot-medusa-order.json
+601 -194
View File
File diff suppressed because it is too large Load Diff
packages/modules/order/src/migrations/Migration20241014142943.ts
+18
View File
@@ -0,0 +1,18 @@
import { Migration } from "@mikro-orm/migrations"
export class Migration20241014142943 extends Migration {
async up(): Promise<void> {
this.addSql(
'alter table if exists "order_item" add column if not exists "compare_at_unit_price" numeric null, add column if not exists "raw_compare_at_unit_price" jsonb null;'
)
}
async down(): Promise<void> {
this.addSql(
'alter table if exists "order_item" drop column if exists "compare_at_unit_price";'
)
this.addSql(
'alter table if exists "order_item" drop column if exists "raw_compare_at_unit_price";'
)
}
}
packages/modules/order/src/models/order-item.ts
+6
View File
@@ -90,6 +90,12 @@ export default class OrderItem {
@Property({ columnType: "jsonb", nullable: true })
raw_unit_price: BigNumberRawValue | null = null
@MikroOrmBigNumberProperty({ nullable: true })
compare_at_unit_price: BigNumber | number | null = null
@Property({ columnType: "jsonb", nullable: true })
raw_compare_at_unit_price: BigNumberRawValue | null = null
@MikroOrmBigNumberProperty()
quantity: BigNumber | number
packages/modules/order/src/services/__tests__/util/actions/exchanges.ts
+6
View File
@@ -10,6 +10,7 @@ describe("Order Exchange - Actions", function () {
id: "1",
quantity: 1,
unit_price: 10,
compare_at_unit_price: null,
order_id: "1",
detail: {
@@ -28,6 +29,7 @@ describe("Order Exchange - Actions", function () {
id: "2",
quantity: 2,
unit_price: 100,
compare_at_unit_price: null,
order_id: "1",
detail: {
@@ -46,6 +48,7 @@ describe("Order Exchange - Actions", function () {
id: "3",
quantity: 3,
unit_price: 20,
compare_at_unit_price: null,
order_id: "1",
detail: {
@@ -127,6 +130,7 @@ describe("Order Exchange - Actions", function () {
order_id: "1",
quantity: 1,
unit_price: 10,
compare_at_unit_price: null,
detail: {
quantity: 1,
order_id: "1",
@@ -144,6 +148,7 @@ describe("Order Exchange - Actions", function () {
order_id: "1",
quantity: 2,
unit_price: 100,
compare_at_unit_price: null,
detail: {
quantity: 2,
order_id: "1",
@@ -161,6 +166,7 @@ describe("Order Exchange - Actions", function () {
order_id: "1",
quantity: 3,
unit_price: 20,
compare_at_unit_price: null,
detail: {
quantity: 3,
order_id: "1",
packages/modules/order/src/services/__tests__/util/actions/returns.ts
+9
View File
@@ -10,6 +10,7 @@ describe("Order Return - Actions", function () {
id: "1",
quantity: 1,
unit_price: 10,
compare_at_unit_price: null,
order_id: "1",
detail: {
@@ -28,6 +29,7 @@ describe("Order Return - Actions", function () {
id: "2",
quantity: 2,
unit_price: 100,
compare_at_unit_price: null,
order_id: "1",
detail: {
@@ -46,6 +48,7 @@ describe("Order Return - Actions", function () {
id: "3",
quantity: 3,
unit_price: 20,
compare_at_unit_price: null,
order_id: "1",
detail: {
@@ -144,6 +147,7 @@ describe("Order Return - Actions", function () {
order_id: "1",
quantity: 1,
unit_price: 10,
compare_at_unit_price: null,
detail: {
order_id: "1",
quantity: 1,
@@ -161,6 +165,7 @@ describe("Order Return - Actions", function () {
order_id: "1",
quantity: 2,
unit_price: 100,
compare_at_unit_price: null,
detail: {
order_id: "1",
quantity: 2,
@@ -178,6 +183,7 @@ describe("Order Return - Actions", function () {
order_id: "1",
quantity: 3,
unit_price: 20,
compare_at_unit_price: null,
detail: {
quantity: 3,
order_id: "1",
@@ -284,6 +290,7 @@ describe("Order Return - Actions", function () {
order_id: "1",
quantity: 1,
unit_price: 10,
compare_at_unit_price: null,
detail: {
quantity: 1,
order_id: "1",
@@ -301,6 +308,7 @@ describe("Order Return - Actions", function () {
order_id: "1",
quantity: 2,
unit_price: 100,
compare_at_unit_price: null,
detail: {
quantity: 2,
order_id: "1",
@@ -318,6 +326,7 @@ describe("Order Return - Actions", function () {
order_id: "1",
quantity: 3,
unit_price: 20,
compare_at_unit_price: null,
detail: {
quantity: 3,
order_id: "1",
packages/modules/order/src/services/order-module-service.ts
+7 -2
View File
@@ -1994,7 +1994,10 @@ export default class OrderModuleService<
if (!isExistingItem) {
addedItems[item.id] = {
...item,
unit_price: item.detail?.unit_price ?? item.unit_price,
quantity: item.detail?.quantity ?? item.quantity,
unit_price: item.detail?.unit_price || item.unit_price,
compare_at_unit_price:
item.detail?.compare_at_unit_price || item.compare_at_unit_price,
}
}
}
@@ -2026,13 +2029,15 @@ export default class OrderModuleService<
const newItem = itemsToUpsert.find((d) => d.item_id === item.id)!
const unitPrice = newItem?.unit_price ?? item.unit_price
const compareAtUnitPrice =
newItem?.compare_at_unit_price ?? item.compare_at_unit_price
calculated.order.items[idx] = {
...lineItem,
actions,
quantity: newItem.quantity,
unit_price: unitPrice,
raw_unit_price: new BigNumber(unitPrice),
compare_at_unit_price: compareAtUnitPrice,
detail: {
...newItem,
...item,
packages/modules/order/src/types/utils/index.ts
+2
View File
@@ -11,6 +11,7 @@ export type VirtualOrder = {
exchange_id?: string
unit_price: BigNumberInput
compare_at_unit_price: BigNumberInput | null
quantity: BigNumberInput
detail: {
@@ -22,6 +23,7 @@ export type VirtualOrder = {
item_id?: string
unit_price?: BigNumberInput
compare_at_unit_price?: BigNumberInput | null
quantity: BigNumberInput
shipped_quantity: BigNumberInput
fulfilled_quantity: BigNumberInput
packages/modules/order/src/utils/actions/item-add.ts
+1
View File
@@ -31,6 +31,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.ITEM_ADD, {
exchange_id: action.exchange_id,
unit_price: action.details.unit_price,
compare_at_unit_price: action.details.compare_at_unit_price,
quantity: action.details.quantity,
} as VirtualOrder["items"][0]
packages/modules/order/src/utils/actions/item-update.ts
+16 -24
View File
@@ -1,5 +1,4 @@
import {
BigNumber,
ChangeActionType,
MathBN,
MedusaError,
@@ -13,36 +12,28 @@ OrderChangeProcessing.registerActionType(ChangeActionType.ITEM_UPDATE, {
(item) => item.id === action.details.reference_id
)
const unitPrice = action.details.unit_price
const existing = currentOrder.items[existingIndex]
existing.detail.quantity ??= 0
let quantityDiff = MathBN.sub(
action.details.quantity,
existing.detail.quantity
const originalQuantity = MathBN.convert(
existing.detail.quantity ?? existing.quantity
)
const originalUnitPrice = MathBN.convert(
existing.detail.unit_price ?? existing.unit_price
)
const quant = new BigNumber(action.details.quantity)
existing.quantity = quant
existing.detail.quantity = quant
const currentQuantity = MathBN.convert(action.details.quantity)
const quantityDiff = MathBN.sub(currentQuantity, originalQuantity)
if (unitPrice) {
const currentUnitPriceBN = MathBN.convert(unitPrice)
const originalUnitPriceBn = MathBN.convert(
existing.detail.unit_price ?? existing.unit_price
)
existing.quantity = currentQuantity
existing.detail.quantity = currentQuantity
const currentQuantityBn = MathBN.convert(action.details.quantity)
const originalQuantityBn = MathBN.convert(
existing.detail.quantity ?? existing.quantity
)
if (action.details.unit_price) {
const currentUnitPrice = MathBN.convert(action.details.unit_price)
const originalTotal = MathBN.mult(originalUnitPrice, originalQuantity)
const currentTotal = MathBN.mult(currentUnitPrice, currentQuantity)
const originalTotal = MathBN.mult(originalUnitPriceBn, originalQuantityBn)
const currentTotal = MathBN.mult(currentUnitPriceBN, currentQuantityBn)
existing.unit_price = currentUnitPriceBN
existing.detail.unit_price = currentUnitPriceBN
existing.unit_price = currentUnitPrice
existing.detail.unit_price = currentUnitPrice
setActionReference(existing, action, options)
@@ -50,6 +41,7 @@ OrderChangeProcessing.registerActionType(ChangeActionType.ITEM_UPDATE, {
}
setActionReference(existing, action, options)
return MathBN.mult(existing.unit_price, quantityDiff)
},
validate({ action, currentOrder }) {
packages/modules/order/src/utils/apply-order-changes.ts
+2
View File
@@ -58,6 +58,8 @@ export function applyChangesToOrder(
version,
quantity: orderItem.quantity,
unit_price: item.unit_price ?? orderItem.unit_price,
compare_at_unit_price:
item.compare_at_unit_price ?? orderItem.compare_at_unit_price,
fulfilled_quantity: orderItem.fulfilled_quantity ?? 0,
delivered_quantity: orderItem.delivered_quantity ?? 0,
shipped_quantity: orderItem.shipped_quantity ?? 0,
packages/modules/order/src/utils/transform-order.ts
+10
View File
@@ -48,6 +48,11 @@ export function formatOrder<T = any>(
raw_quantity: detail.raw_quantity,
unit_price: detail.unit_price ?? orderItem.item.unit_price,
raw_unit_price: detail.raw_unit_price ?? orderItem.item.raw_unit_price,
compare_at_unit_price:
detail.compare_at_unit_price ?? orderItem.item.compare_at_unit_price,
raw_compare_at_unit_price:
detail.raw_compare_at_unit_price ??
orderItem.item.raw_compare_at_unit_price,
detail,
}
})
@@ -254,6 +259,11 @@ export function mapRepositoryToOrderModel(config, isRelatedEntity = false) {
delete conf.where.items.item.unit_price
}
if (original.compare_at_unit_price) {
conf.where.items.compare_at_unit_price = original.compare_at_unit_price
delete conf.where.items.item.compare_at_unit_price
}
if (original.detail) {
conf.where.items = {
...original.detail,
packages/modules/pricing/src/services/pricing-module.ts
+1 -1
View File
@@ -47,8 +47,8 @@ import {
PriceSet,
} from "@models"
import { eventBuilders, validatePriceListDates } from "@utils"
import { ServiceTypes } from "@types"
import { eventBuilders, validatePriceListDates } from "@utils"
import { joinerConfig } from "../joiner-config"
type InjectedDependencies = {