Skip to content

The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.

fix(promotion): keep seller promotions scoped across cart refreshes (#1648)

Viktor Holike4552dcee6fa
diff --git a/integration-tests/http/promotions/store/offer-promotion-cart.spec.ts b/integration-tests/http/promotions/store/offer-promotion-cart.spec.ts
index c8647ef9d..581aeb5f2 100644
--- a/integration-tests/http/promotions/store/offer-promotion-cart.spec.ts
+++ b/integration-tests/http/promotions/store/offer-promotion-cart.spec.ts
@@ -15,6 +15,8 @@ import {
generateStoreHeaders,
} from "../../../helpers/create-admin-user"
import { createVendorProduct } from "../../../helpers/create-product"
+import { createCustomerUser } from "../../../helpers/create-customer-user"
+import { seedSellerOfferWithShipping } from "../../../helpers/split-order-checkout"
jest.setTimeout(120000)
@@ -139,6 +141,52 @@ medusaIntegrationTestRunner({
)
).data.promotion
+ const createUntargetedPromotion = async (
+ headers: any,
+ code: string,
+ value: number,
+ isAutomatic = false
+ ) =>
+ (
+ await api.post(
+ `/vendor/promotions`,
+ {
+ code,
+ type: "standard",
+ status: "active",
+ is_automatic: isAutomatic,
+ application_method: {
+ type: "percentage",
+ target_type: "items",
+ allocation: "each",
+ value,
+ max_quantity: 1,
+ },
+ },
+ headers
+ )
+ ).data.promotion
+
+ const getCart = async (cartId: string, headers = storeHeaders) =>
+ (await api.get(`/store/carts/${cartId}`, headers)).data.cart
+
+ const findLine = (cart: any, offerId: string) =>
+ cart.items.find((i: any) => i.metadata?.offer_id === offerId)
+
+ const expectOnlySellerADiscounted = (
+ cart: any,
+ offerA: string,
+ offerB: string,
+ amount: number
+ ) => {
+ const lineA = findLine(cart, offerA)
+ const lineB = findLine(cart, offerB)
+ expect(lineA.adjustments).toHaveLength(1)
+ expect(lineA.adjustments[0].amount).toEqual(amount)
+ expect(lineB.adjustments ?? []).toHaveLength(0)
+ expect(cart.discount_total).toEqual(amount)
+ }
+
beforeAll(() => {
appContainer = getContainer()
})
@@ -298,6 +346,283 @@ medusaIntegrationTestRunner({
expect(response.data.cart.total).toEqual(4500)
})
+ it("keeps an untargeted seller promotion scoped across cart refreshes", async () => {
+ const sellerA = await seedSellerOffer({
+ email: "[email protected]",
+ name: "Cart Refresh A",
+ offerPrice: 2000,
+ offerSku: "CART-REFRESH-A-OFFER",
+ })
+ const sellerB = await seedSellerOffer({
+ email: "[email protected]",
+ name: "Cart Refresh B",
+ offerPrice: 3000,
+ offerSku: "CART-REFRESH-B-OFFER",
+ })
+
+ await createUntargetedPromotion(sellerA.headers, "REFRESHA", 10)
+
+ const cart = await createCart()
+ await api.post(
+ `/store/carts/${cart.id}/line-items`,
+ { offer_id: sellerA.offer.id, quantity: 1 },
+ storeHeaders
+ )
+ await api.post(
+ `/store/carts/${cart.id}/line-items`,
+ { offer_id: sellerB.offer.id, quantity: 1 },
+ storeHeaders
+ )
+
+ const applied = await api.post(
+ `/store/carts/${cart.id}/promotions`,
+ { promo_codes: ["REFRESHA"] },
+ storeHeaders
+ )
+ expect(applied.status).toEqual(200)
+ expectOnlySellerADiscounted(
+ applied.data.cart,
+ sellerA.offer.id,
+ sellerB.offer.id,
+ 200
+ )
+
+ const updated = await api.post(
+ `/store/carts/${cart.id}`,
+ { email: "[email protected]" },
+ storeHeaders
+ )
+ expect(updated.status).toEqual(200)
+ expectOnlySellerADiscounted(
+ await getCart(cart.id),
+ sellerA.offer.id,
+ sellerB.offer.id,
+ 200
+ )
+
+ const lineB = findLine(updated.data.cart, sellerB.offer.id)
+ const quantityUpdated = await api.post(
+ `/store/carts/${cart.id}/line-items/${lineB.id}`,
+ { quantity: 2 },
+ storeHeaders
+ )
+ expect(quantityUpdated.status).toEqual(200)
+ expectOnlySellerADiscounted(
+ await getCart(cart.id),
+ sellerA.offer.id,
+ sellerB.offer.id,
+ 200
+ )
+ })
+
+ it("applies an automatic seller promotion only to that seller's items", async () => {
+ const sellerA = await seedSellerOffer({
+ email: "[email protected]",
+ name: "Cart Auto A",
+ offerPrice: 2000,
+ offerSku: "CART-AUTO-A-OFFER",
+ })
+ const sellerB = await seedSellerOffer({
+ email: "[email protected]",
+ name: "Cart Auto B",
+ offerPrice: 3000,
+ offerSku: "CART-AUTO-B-OFFER",
+ })
+
+ await createUntargetedPromotion(sellerA.headers, "AUTOA", 10, true)
+
+ const cart = await createCart()
+ await api.post(
+ `/store/carts/${cart.id}/line-items`,
+ { offer_id: sellerA.offer.id, quantity: 1 },
+ storeHeaders
+ )
+ await api.post(
+ `/store/carts/${cart.id}/line-items`,
+ { offer_id: sellerB.offer.id, quantity: 1 },
+ storeHeaders
+ )
+ expectOnlySellerADiscounted(
+ await getCart(cart.id),
+ sellerA.offer.id,
+ sellerB.offer.id,
+ 200
+ )
+
+ await api.post(
+ `/store/carts/${cart.id}`,
+ { email: "[email protected]" },
+ storeHeaders
+ )
+ expectOnlySellerADiscounted(
+ await getCart(cart.id),
+ sellerA.offer.id,
+ sellerB.offer.id,
+ 200
+ )
+ })
+
+ it("does not carry a seller promotion onto another seller's split order", async () => {
+ const customer = await createCustomerUser(appContainer, {
+ email: "[email protected]",
+ first_name: "Split",
+ last_name: "Buyer",
+ })
+ const buyerHeaders = {
+ headers: {
+ ...storeHeaders.headers,
+ ...customer.headers.headers,
+ },
+ }
+
+ const sellerA = await seedSellerOfferWithShipping({
+ container: appContainer,
+ api,
+ salesChannelId: salesChannel.id,
+ email: "[email protected]",
+ name: "CartSplitA",
+ stocked: 10,
+ offerPrice: 2000,
+ })
+ const sellerB = await seedSellerOfferWithShipping({
+ container: appContainer,
+ api,
+ salesChannelId: salesChannel.id,
+ email: "[email protected]",
+ name: "CartSplitB",
+ stocked: 10,
+ offerPrice: 3000,
+ })
+
+ const promotion = await createUntargetedPromotion(
+ sellerA.headers,
+ "SPLITA",
+ 10,
+ true
+ )
+
+ const cart = (
+ await api.post(
+ `/store/carts`,
+ {
+ region_id: region.id,
+ sales_channel_id: salesChannel.id,
+ currency_code: "usd",
+ },
+ buyerHeaders
+ )
+ ).data.cart
+ for (const offerId of [sellerA.offer.id, sellerB.offer.id]) {
+ await api.post(
+ `/store/carts/${cart.id}/line-items`,
+ { offer_id: offerId, quantity: 1 },
+ buyerHeaders
+ )
+ }
+
+ const address = {
+ first_name: "Split",
+ last_name: "Buyer",
+ address_1: "123 Main St",
+ city: "New York",
+ country_code: "us",
+ postal_code: "10001",
+ }
+ await api.post(
+ `/store/carts/${cart.id}`,
+ {
+ email: customer.customer.email,
+ shipping_address: address,
+ billing_address: address,
+ },
+ buyerHeaders
+ )
+
+ const shippingOptions = Object.values(
+ (
+ await api.get(
+ `/store/shipping-options?cart_id=${cart.id}`,
+ buyerHeaders
+ )
+ ).data.shipping_options as Record<string, any[]>
+ ).flat()
+ for (const option of shippingOptions) {
+ await api.post(
+ `/store/carts/${cart.id}/shipping-methods`,
+ { option_id: option.id },
+ buyerHeaders
+ )
+ }
+
+ expectOnlySellerADiscounted(
+ await getCart(cart.id, buyerHeaders),
+ sellerA.offer.id,
+ sellerB.offer.id,
+ 200
+ )
+
+ const paymentCollection = (
+ await api.post(
+ `/store/payment-collections`,
+ { cart_id: cart.id },
+ buyerHeaders
+ )
+ ).data.payment_collection
+ await api.post(
+ `/store/payment-collections/${paymentCollection.id}/payment-sessions`,
+ { provider_id: "pp_system_default" },
+ buyerHeaders
+ )
+
+ const completed = await api.post(
+ `/store/carts/${cart.id}/complete`,
+ {},
+ buyerHeaders
+ )
+ expect(completed.status).toEqual(200)
+ expect(completed.data.type).toEqual("order_group")
+
+ const query = appContainer.resolve(ContainerRegistrationKeys.QUERY)
+ const { data: orderGroups } = await query.graph({
+ entity: "order_group",
+ filters: { id: completed.data.order_group.id },
+ fields: ["id", "orders.id"],
+ })
+ const { data: orders } = await query.graph({
+ entity: "order",
+ filters: {
+ id: (orderGroups[0] as any).orders.map((o: any) => o.id),
+ },
+ fields: [
+ "id",
+ "seller.id",
+ "items.id",
+ "items.adjustments.promotion_id",
+ "shipping_methods.adjustments.promotion_id",
+ ],
+ })
+
+ const orderA = orders.find(
+ (o: any) => o.seller?.id === sellerA.sellerId
+ ) as any
+ const orderB = orders.find(
+ (o: any) => o.seller?.id === sellerB.sellerId
+ ) as any
+ expect(orderA).toBeDefined()
+ expect(orderB).toBeDefined()
+
+ const adjustmentsOf = (order: any) => [
+ ...order.items.flatMap((i: any) => i.adjustments ?? []),
+ ...(order.shipping_methods ?? []).flatMap(
+ (sm: any) => sm.adjustments ?? []
+ ),
+ ]
+ expect(adjustmentsOf(orderA).map((a: any) => a.promotion_id)).toContain(
+ promotion.id
+ )
+ expect(adjustmentsOf(orderB)).toHaveLength(0)
+ })
+
it("does not discount an offer the promotion is not targeting", async () => {
const seed = await seedSellerOffer({
diff --git a/packages/core/src/patches/__tests__/jest-transformer.unit.spec.ts b/packages/core/src/patches/__tests__/jest-transformer.unit.spec.ts
index fb1acc5d2..afd67477f 100644
--- a/packages/core/src/patches/__tests__/jest-transformer.unit.spec.ts
+++ b/packages/core/src/patches/__tests__/jest-transformer.unit.spec.ts
@@ -61,7 +61,18 @@ describe("jest transformer", () => {
const { code } = transform(readFileSync(sourcePath, "utf8"), sourcePath)
expect(code).toContain(`createHook)("${hookName}"`)
- expect(code).toContain(`hooks: [${hookName}]`)
+ expect(code).toMatch(new RegExp(`hooks: \\[[^\\]]*\\b${hookName}\\]`))
+ })
+
+ it("scopes promotion adjustments to the seller in prepare-adjustments-from-promotion-actions", () => {
+ const sourcePath = join(
+ copy().dir,
+ "dist/cart/steps/prepare-adjustments-from-promotion-actions.js"
+ )
+ const { code } = transform(readFileSync(sourcePath, "utf8"), sourcePath)
+
+ expect(code).toContain('fields: ["id", "code", "seller.id"]')
+ expect(code).toContain('fields: ["id", "offer.seller_id"]')
})
it("leaves files it does not target untouched", () => {
diff --git a/packages/core/src/patches/manifest.ts b/packages/core/src/patches/manifest.ts
index 8fe1eb73c..695556b37 100644
--- a/packages/core/src/patches/manifest.ts
+++ b/packages/core/src/patches/manifest.ts
@@ -38,6 +38,17 @@ export const PATCHES: PatchEntry[] = [
"record every capture and refund inside the movement's own transaction, with " +
"compensation, needs paymentCaptured and paymentRefunded.",
},
+ {
+ file: "@[email protected]",
+ package: "@medusajs/core-flows",
+ compatible: { from: "2.21.0", to: "2.22.0" },
+ reason:
+ "prepareAdjustmentsFromPromotionActionsStep hands back every adjustment the " +
+ "promotion module computes for the whole cart, and every cart refresh runs it " +
+ "through updateCartPromotionsWorkflow. Without the seller scope applied in the " +
+ "step itself, a seller's promotion lands on other sellers' line items and " +
+ "shipping methods as soon as the cart is touched. See GHSA-w4vq-6jvh-cfpg.",
+ },
{
package: "@medusajs/core-flows",
diff --git a/packages/core/src/patches/patches/@[email protected] b/packages/core/src/patches/patches/@[email protected]
new file mode 100644
index 000000000..768dc6af3
--- /dev/null
+++ b/packages/core/src/patches/patches/@[email protected]
@@ -0,0 +1,62 @@
+diff --git a/dist/cart/steps/prepare-adjustments-from-promotion-actions.js b/dist/cart/steps/prepare-adjustments-from-promotion-actions.js
+index cf494cc..b2be9fc 100644
+--- a/dist/cart/steps/prepare-adjustments-from-promotion-actions.js
++++ b/dist/cart/steps/prepare-adjustments-from-promotion-actions.js
+@@ -33,13 +33,13 @@ exports.prepareAdjustmentsFromPromotionActionsStep = (0, workflows_sdk_1.createS
+ }
+ const { data: promotions } = await query.graph({
+ entity: "promotion",
+- fields: ["id", "code"],
++ fields: ["id", "code", "seller.id"],
+ filters: { code: actions.map((a) => a.code) },
+ }, { cache: { enable: true } });
+ const promotionsMap = new Map(promotions.map((promotion) => [promotion.code, promotion]));
+- const lineItemAdjustmentsToCreate = [];
++ let lineItemAdjustmentsToCreate = [];
+ const lineItemAdjustmentIdsToRemove = [];
+- const shippingMethodAdjustmentsToCreate = [];
++ let shippingMethodAdjustmentsToCreate = [];
+ const shippingMethodAdjustmentIdsToRemove = [];
+ const skippedPromoCodes = [];
+ for (const action of actions) {
+@@ -83,6 +83,40 @@ exports.prepareAdjustmentsFromPromotionActionsStep = (0, workflows_sdk_1.createS
+ break;
+ }
+ }
++ // MERCUR: the promotion module computes adjustments against the whole cart,
++ // so a seller's promotion lands on every seller's lines and shipping. Every
++ // cart refresh funnels through this step, so the seller scope is enforced
++ // here, before anything is written. A promotion without a seller link is a
++ // platform promotion and may discount anything. See GHSA-w4vq-6jvh-cfpg.
++ const sellerOfPromotion = new Map(promotions.map((promotion) => [promotion.id, promotion.seller?.id ?? null]));
++ const inSellerScope = (promotionId, targetSellerId) => {
++ const promotionSellerId = promotionId ? (sellerOfPromotion.get(promotionId) ?? null) : null;
++ return !promotionSellerId || promotionSellerId === targetSellerId;
++ };
++ if (lineItemAdjustmentsToCreate.length) {
++ const { data: lineItems } = await query.graph({
++ entity: "line_item",
++ fields: ["id", "offer.seller_id"],
++ filters: { id: [...new Set(lineItemAdjustmentsToCreate.map((a) => a.item_id))] },
++ }, { cache: { enable: true } });
++ const sellerOfLineItem = new Map(lineItems.map((item) => [item.id, item.offer?.seller_id ?? null]));
++ lineItemAdjustmentsToCreate = lineItemAdjustmentsToCreate.filter((adjustment) => inSellerScope(adjustment.promotion_id, sellerOfLineItem.get(adjustment.item_id)));
++ }
++ if (shippingMethodAdjustmentsToCreate.length) {
++ const { data: shippingMethods } = await query.graph({
++ entity: "shipping_method",
++ fields: ["id", "shipping_option_id"],
++ filters: { id: [...new Set(shippingMethodAdjustmentsToCreate.map((a) => a.shipping_method_id))] },
++ }, { cache: { enable: true } });
++ const { data: shippingOptions } = await query.graph({
++ entity: "shipping_option",
++ fields: ["id", "seller.id"],
++ filters: { id: [...new Set(shippingMethods.map((sm) => sm.shipping_option_id).filter(Boolean))] },
++ }, { cache: { enable: true } });
++ const sellerOfShippingOption = new Map(shippingOptions.map((option) => [option.id, option.seller?.id ?? null]));
++ const sellerOfShippingMethod = new Map(shippingMethods.map((sm) => [sm.id, sm.shipping_option_id ? (sellerOfShippingOption.get(sm.shipping_option_id) ?? null) : null]));
++ shippingMethodAdjustmentsToCreate = shippingMethodAdjustmentsToCreate.filter((adjustment) => inSellerScope(adjustment.promotion_id, sellerOfShippingMethod.get(adjustment.shipping_method_id)));
++ }
+ const computedPromotionCodes = [
+ ...lineItemAdjustmentsToCreate,
+ ...shippingMethodAdjustmentsToCreate,
diff --git a/packages/core/src/workflows/cart/steps/get-promotion-seller-ids.ts b/packages/core/src/workflows/cart/steps/get-promotion-seller-ids.ts
new file mode 100644
index 000000000..8c16cad65
--- /dev/null
+++ b/packages/core/src/workflows/cart/steps/get-promotion-seller-ids.ts
@@ -0,0 +1,24 @@
+import { Query } from "@medusajs/framework"
+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"
+import { StepResponse, createStep } from "@medusajs/framework/workflows-sdk"
+import {
+ loadPromotionSellerIds,
+ PromotionSellerIds,
+} from "../utils/seller-promotion-scope"
+
+export type GetPromotionSellerIdsStepInput = {
+ promotion_ids: Array<string | null | undefined>
+}
+
+export const getPromotionSellerIdsStep = createStep(
+ "get-promotion-seller-ids",
+ async (data: GetPromotionSellerIdsStepInput, { container }) => {
+ const query = container.resolve<Query>(ContainerRegistrationKeys.QUERY)
+ const promotionSellerIds: PromotionSellerIds = await loadPromotionSellerIds(
+ query,
+ data.promotion_ids
+ )
+
+ return new StepResponse(promotionSellerIds)
+ }
+)
diff --git a/packages/core/src/workflows/cart/steps/index.ts b/packages/core/src/workflows/cart/steps/index.ts
index c399f9272..a0881fb73 100644
--- a/packages/core/src/workflows/cart/steps/index.ts
+++ b/packages/core/src/workflows/cart/steps/index.ts
@@ -1,3 +1,4 @@
+export * from "./get-promotion-seller-ids"
export * from "./link-line-item-to-offer"
export * from "./mirror-line-item-offer-links-to-order"
export * from "./validate-seller-cart-items"
diff --git a/packages/core/src/workflows/cart/steps/prepare-adjustments-from-promotion-actions.ts b/packages/core/src/workflows/cart/steps/prepare-adjustments-from-promotion-actions.ts
deleted file mode 100644
index 55341a12d..000000000
--- a/packages/core/src/workflows/cart/steps/prepare-adjustments-from-promotion-actions.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import { Query } from "@medusajs/framework"
-import {
- AddItemAdjustmentAction,
- AddShippingMethodAdjustment,
- ComputeActions,
- PromotionDTO,
- RemoveItemAdjustmentAction,
- RemoveShippingMethodAdjustment,
-} from "@medusajs/framework/types"
-import {
- ComputedActions,
- ContainerRegistrationKeys,
- promiseAll,
-} from "@medusajs/framework/utils"
-import { StepResponse, createStep } from "@medusajs/framework/workflows-sdk"
-import { PrepareAdjustmentsFromPromotionActionsStepOutput } from "@medusajs/medusa/core-flows"
-
-
-export interface PrepareSellerAdjustmentsFromPromotionActionsStepInput {
- actions: ComputeActions[]
-}
-
-export const prepareSellerAdjustmentsFromPromotionActionsStep = createStep(
- "prepare-seller-adjustments-from-promotion-actions",
- async (
- data: PrepareSellerAdjustmentsFromPromotionActionsStepInput,
- { container }
- ) => {
- const query = container.resolve<Query>(ContainerRegistrationKeys.QUERY)
-
- const { actions = [] } = data
-
- if (!actions.length) {
- return new StepResponse({
- lineItemAdjustmentsToCreate: [],
- lineItemAdjustmentIdsToRemove: [],
- shippingMethodAdjustmentsToCreate: [],
- shippingMethodAdjustmentIdsToRemove: [],
- computedPromotionCodes: [],
- skippedPromoCodes: [],
- } as PrepareAdjustmentsFromPromotionActionsStepOutput)
- }
-
- const [{ data: promotions }, { data: lineItems }, { data: shippingMethods }] = await promiseAll([query.graph(
- {
- entity: "promotion",
- fields: ["id", "code", 'seller.id'],
- filters: { code: actions.map((a) => a.code) },
- },
- { cache: { enable: true } },
- ), query.graph(
- {
- entity: "line_item",
- fields: ['id', 'offer.seller_id', 'variant.product.seller.id'],
- filters: { id: actions.filter((a) => a.action === ComputedActions.ADD_ITEM_ADJUSTMENT).map((a) => (a as AddItemAdjustmentAction).item_id) },
- },
- { cache: { enable: true } },
- ), query.graph(
- {
- entity: "shipping_method",
- fields: ['id', 'shipping_option_id'],
- filters: { id: actions.filter((a) => a.action === ComputedActions.ADD_SHIPPING_METHOD_ADJUSTMENT).map((a) => (a as AddShippingMethodAdjustment).shipping_method_id) },
- },
- { cache: { enable: true } },
- )])
- const { data: shippingOptions } = await query.graph(
- {
- entity: "shipping_option",
- fields: ['id', 'seller.id'],
- filters: { id: shippingMethods.map((sm) => sm.shipping_option_id) },
- },
- { cache: { enable: true } },
- )
-
- const promotionsMap = new Map<string, PromotionDTO & { seller?: { id: string } }>(
- promotions.map((promotion) => [promotion.code!, promotion])
- )
- const shippingMethodsMap = new Map<string, { id: string, shipping_option_id: string, }>(
- shippingMethods.map((shippingMethod) => [shippingMethod.id!, shippingMethod])
- )
- const shippingOptionsMap = new Map<string, { id: string, seller?: { id: string } }>(
- shippingOptions.map((shippingOption) => [shippingOption.id!, shippingOption])
- )
- const lineItemsMap = new Map<string, { id: string, offer?: { seller_id?: string }, variant?: { product?: { seller?: { id: string } } } }>(
- lineItems.map((lineItem) => [lineItem.id!, lineItem])
- )
-
- const lineItemAdjustmentsToCreate: PrepareAdjustmentsFromPromotionActionsStepOutput["lineItemAdjustmentsToCreate"] =
- []
- const lineItemAdjustmentIdsToRemove: string[] = []
- const shippingMethodAdjustmentsToCreate: PrepareAdjustmentsFromPromotionActionsStepOutput["shippingMethodAdjustmentsToCreate"] =
- []
- const shippingMethodAdjustmentIdsToRemove: string[] = []
-
- for (const action of actions) {
- switch (action.action) {
- case ComputedActions.ADD_ITEM_ADJUSTMENT:
- const itemAction = action as AddItemAdjustmentAction
- const promotion = promotionsMap.get(itemAction.code)
- const lineItem = lineItemsMap.get(itemAction.item_id)
-
- if (promotion && lineItem) {
- const promotionSellerId = promotion.seller?.id
- const itemSellerId =
- lineItem.offer?.seller_id
-
- if (!promotionSellerId || promotionSellerId === itemSellerId) {
- lineItemAdjustmentsToCreate.push({
- code: action.code,
- amount: itemAction.amount as number,
- is_tax_inclusive: itemAction.is_tax_inclusive,
- item_id: itemAction.item_id,
- promotion_id: promotion.id,
- } as PrepareAdjustmentsFromPromotionActionsStepOutput["lineItemAdjustmentsToCreate"][number])
- }
- }
- break
- case ComputedActions.REMOVE_ITEM_ADJUSTMENT:
- lineItemAdjustmentIdsToRemove.push(
- (action as RemoveItemAdjustmentAction).adjustment_id
- )
- break
- case ComputedActions.ADD_SHIPPING_METHOD_ADJUSTMENT:
- const shippingAction = action as AddShippingMethodAdjustment
- const shippingMethod = shippingMethodsMap.get(shippingAction.shipping_method_id)
- const shippingOption = shippingOptionsMap.get(shippingMethod?.shipping_option_id!)
- const shippingPromotion = promotionsMap.get(action.code)
-
- if (shippingMethod && shippingPromotion) {
- const promotionSellerId = shippingPromotion.seller?.id
- const shippingMethodSellerId = shippingOption?.seller?.id
-
- if (!promotionSellerId || promotionSellerId === shippingMethodSellerId) {
- shippingMethodAdjustmentsToCreate.push({
- code: action.code,
- amount: shippingAction.amount as number,
- shipping_method_id: shippingAction.shipping_method_id,
- promotion_id: shippingPromotion.id,
- })
- }
- }
- break
- case ComputedActions.REMOVE_SHIPPING_METHOD_ADJUSTMENT:
- shippingMethodAdjustmentIdsToRemove.push(
- (action as RemoveShippingMethodAdjustment).adjustment_id
- )
- break
- }
- }
-
- const computedPromotionCodes = [
- ...lineItemAdjustmentsToCreate,
- ...shippingMethodAdjustmentsToCreate,
- ].map((adjustment) => adjustment.code)
-
- return new StepResponse({
- lineItemAdjustmentsToCreate,
- lineItemAdjustmentIdsToRemove,
- shippingMethodAdjustmentsToCreate,
- shippingMethodAdjustmentIdsToRemove,
- computedPromotionCodes,
- skippedPromoCodes: [],
- } as PrepareAdjustmentsFromPromotionActionsStepOutput)
- }
-)
\ No newline at end of file
diff --git a/packages/core/src/workflows/cart/utils/index.ts b/packages/core/src/workflows/cart/utils/index.ts
index 1ee0fdb9f..54d485aa8 100644
--- a/packages/core/src/workflows/cart/utils/index.ts
+++ b/packages/core/src/workflows/cart/utils/index.ts
@@ -1,3 +1,4 @@
export * from './fields'
export * from './prepare-line-item-data'
export * from './schemas'
+export * from './seller-promotion-scope'
diff --git a/packages/core/src/workflows/cart/utils/seller-promotion-scope.ts b/packages/core/src/workflows/cart/utils/seller-promotion-scope.ts
new file mode 100644
index 000000000..bf87d91ea
--- /dev/null
+++ b/packages/core/src/workflows/cart/utils/seller-promotion-scope.ts
@@ -0,0 +1,49 @@
+import { Query } from "@medusajs/framework"
+
+/**
+ * Seller id per promotion id. A promotion without a seller link is a
+ * platform promotion and maps to `null`.
+ */
+export type PromotionSellerIds = Record<string, string | null>
+
+const unique = (values: Array<string | undefined | null>): string[] =>
+ Array.from(
+ new Set(values.filter((v): v is string => typeof v === "string" && v.length > 0))
+ )
+
+export const loadPromotionSellerIds = async (
+ query: Query,
+ promotionIds: Array<string | undefined | null>
+): Promise<PromotionSellerIds> => {
+ const ids = unique(promotionIds)
+ if (!ids.length) {
+ return {}
+ }
+
+ const { data: promotions } = await query.graph(
+ {
+ entity: "promotion",
+ fields: ["id", "seller.id"],
+ filters: { id: ids },
+ },
+ { cache: { enable: true } }
+ )
+
+ const result: PromotionSellerIds = {}
+ for (const promotion of promotions as Array<{
+ id: string
+ seller?: { id: string } | null
+ }>) {
+ result[promotion.id] = promotion.seller?.id ?? null
+ }
+ return result
+}
+
+/**
+ * A seller's promotion may only discount that seller's lines and shipping;
+ * a platform promotion (no seller link) may discount anything.
+ */
+export const isAdjustmentInSellerScope = (
+ promotionSellerId: string | null | undefined,
+ targetSellerId: string | null | undefined
+): boolean => !promotionSellerId || promotionSellerId === targetSellerId
diff --git a/packages/core/src/workflows/cart/workflows/complete-cart-with-split-orders.ts b/packages/core/src/workflows/cart/workflows/complete-cart-with-split-orders.ts
index ada951ef9..f2ca2146c 100644
--- a/packages/core/src/workflows/cart/workflows/complete-cart-with-split-orders.ts
+++ b/packages/core/src/workflows/cart/workflows/complete-cart-with-split-orders.ts
@@ -36,16 +36,19 @@ import { CreateOrderGroupDTO, MercurModules, SellerDTO } from "@mercurjs/types"
import { createOrderGroupStep } from "../../order-group"
import { OrderGroupWorkflowEvents } from "../../events"
import {
+ getPromotionSellerIdsStep,
mirrorLineItemOfferLinksToOrderStep,
validateSellerCartItemsStep,
validateSellerCartShippingStep,
} from "../steps"
import {
completeCartFields,
+ isAdjustmentInSellerScope,
prepareAdjustmentsData,
PrepareLineItemDataInput,
prepareLineItemData,
prepareTaxLinesData,
+ PromotionSellerIds,
} from "../utils"
import { registerUsageStep } from "../../promotion"
import { splitCapturedCartPaymentWorkflow } from "../../payment/workflows/split-order-payments"
@@ -162,8 +165,27 @@ export const completeCartWithSplitOrdersWorkflow = createWorkflow(
const orderStatusResult = setOrderStatus.getResult()
- const { ordersToCreate, sellerOrdersMap, offerIdsByOrderId } = transform({ cart: cartData.data, shippingOptionsData: shippingOptionsData.data, orderStatusResult }, ({ cart, shippingOptionsData, orderStatusResult }) => {
+ const cartPromotionIds = transform({ cart: cartData.data }, ({ cart }) => {
+ const adjustments = [
+ ...(cart.items ?? []).flatMap((item) => item.adjustments ?? []),
+ ...(cart.shipping_methods ?? []).flatMap((sm) => sm.adjustments ?? []),
+ ]
+ return { promotion_ids: adjustments.map((adjustment) => adjustment.promotion_id) }
+ })
+
+ const promotionSellerIds = getPromotionSellerIdsStep(cartPromotionIds)
+
+ const { ordersToCreate, sellerOrdersMap, offerIdsByOrderId } = transform({ cart: cartData.data, shippingOptionsData: shippingOptionsData.data, orderStatusResult, promotionSellerIds }, ({ cart, shippingOptionsData, orderStatusResult, promotionSellerIds }) => {
const statusResult = orderStatusResult as SetOrderStatusHookResult
+ const sellerIdOfPromotion = (promotionId?: string | null) =>
+ promotionId ? ((promotionSellerIds as PromotionSellerIds)[promotionId] ?? null) : null
+ const sellerAdjustments = <T extends { promotion_id?: string | null }>(
+ adjustments: T[],
+ sellerId: string
+ ) =>
+ adjustments.filter((adjustment) =>
+ isAdjustmentInSellerScope(sellerIdOfPromotion(adjustment.promotion_id), sellerId)
+ )
const cartSellerIds = new Set<string>(
(cart.items ?? [])
.map((item: any) => item.offer?.seller_id)
@@ -215,7 +237,7 @@ export const completeCartWithSplitOrdersWorkflow = createWorkflow(
unitPrice: item.unit_price,
isTaxInclusive: item.is_tax_inclusive,
taxLines: item.tax_lines ?? [],
- adjustments: item.adjustments ?? [],
+ adjustments: sellerAdjustments(item.adjustments ?? [], sellerId),
}
return prepareLineItemData(input)
})
@@ -230,7 +252,9 @@ export const completeCartWithSplitOrdersWorkflow = createWorkflow(
data: sm.data,
metadata: sm.metadata,
tax_lines: prepareTaxLinesData(sm.tax_lines ?? []),
- adjustments: prepareAdjustmentsData(sm.adjustments ?? []),
+ adjustments: prepareAdjustmentsData(
+ sellerAdjustments(sm.adjustments ?? [], sellerId)
+ ),
}
})
diff --git a/packages/core/src/workflows/cart/workflows/update-cart-seller-promotions.ts b/packages/core/src/workflows/cart/workflows/update-cart-seller-promotions.ts
index 7f294497f..dfc705816 100644
--- a/packages/core/src/workflows/cart/workflows/update-cart-seller-promotions.ts
+++ b/packages/core/src/workflows/cart/workflows/update-cart-seller-promotions.ts
@@ -7,9 +7,8 @@ import {
when,
WorkflowResponse,
} from "@medusajs/framework/workflows-sdk"
-import { acquireLockStep, createLineItemAdjustmentsStep, createShippingMethodAdjustmentsStep, getActionsToComputeFromPromotionsStep, getPromotionCodesToApply, refreshPaymentCollectionForCartWorkflow, releaseLockStep, removeLineItemAdjustmentsStep, removeShippingMethodAdjustmentsStep, updateCartPromotionsStep, UpdateCartPromotionsWorkflowInput, useQueryGraphStep, validateCartStep } from "@medusajs/medusa/core-flows"
+import { acquireLockStep, createLineItemAdjustmentsStep, createShippingMethodAdjustmentsStep, getActionsToComputeFromPromotionsStep, getPromotionCodesToApply, prepareAdjustmentsFromPromotionActionsStep, refreshPaymentCollectionForCartWorkflow, releaseLockStep, removeLineItemAdjustmentsStep, removeShippingMethodAdjustmentsStep, updateCartPromotionsStep, UpdateCartPromotionsWorkflowInput, useQueryGraphStep, validateCartStep } from "@medusajs/medusa/core-flows"
import { cartFieldsForRefreshSteps } from "../utils"
-import { prepareSellerAdjustmentsFromPromotionActionsStep } from "../steps/prepare-adjustments-from-promotion-actions"
export const updateCartSellerPromotionsWorkflow = createWorkflow(
@@ -73,7 +72,7 @@ export const updateCartSellerPromotionsWorkflow = createWorkflow(
shippingMethodAdjustmentsToCreate,
shippingMethodAdjustmentIdsToRemove,
computedPromotionCodes,
- } = prepareSellerAdjustmentsFromPromotionActionsStep({ actions })
+ } = prepareAdjustmentsFromPromotionActionsStep({ actions })
parallelize(
removeLineItemAdjustmentsStep({ lineItemAdjustmentIdsToRemove }),