* add feature flag for tax inclusive pricing * update db model for TIP * add migration * set featureflag column decorators * remove unused prop * update tests to reflect feature_flags as any array * fix types * reference key from featureFlag file * use feature flag key in models * fix copy paste mistake * unify spelling * Create gorgeous-experts-guess.md * feat(medusa): create/update endpoints of currency/region/price-lists/shipping-options should allow to pass includes_tax * test(integration): continue to add some integration test * test(integration): continue to add some integration test * test(unit): Fix region service tests * fix(medusa): API unit tests flags management * feat(medusa): Minor cleanup * style(medusa): Fix typo * fix(medusa): rebase * feat(medusa): Replace old tag with the new one * feat(medusa): revert flag * feat(medusa): Cleanup * feat(medusa): feedback * feat(medusa): Rename currency retrieve method * test(medudsa): fix unit tests * chore(medusa): fix oas * feat(medusa): ShippingMethod should include tax setting from parent option (#2021) * feat(medusa): Shipping method should includes tax from parent options * feat(medusa): Condition the includes tax flag to the availability of the feature and add some other tests * test(integration): Move cart/order ff test in separate files * fix: snapshots folder * fix(integration): snapshots * Create calm-baboons-sit.md * test(integration): file naming Co-authored-by: Carlos R. L. Rodrigues <rodrigolr@gmail.com> * Feat/tax inclusive pricing extend price selection strategy (#2087) * initial changes to price selection strategy including unit tests * typing for tax calculation * update types and remove region and currency from prices results * fix casing * include tax calculation in priceselectionstrategy * integration tests for tax inclusive pricing price calculations * fix build * include tax inclusive considerations when calculating tax fields for variants * include only "includes_tax" fields from currency and region joins * test to see errors in pipelines * conditionally join featureflagged fields * add "includes_tax" to price list factory * add tests for tax inclusive price list prices and currency prices * fix unit tests * refactor pricing array checks to expect arraycontaining * undo error handler * Feat/tax inclusive pricing flag on generated lineitems (#2108) * include tax inclusive pricing flag on generated lineitems * initial addition of tax inclusivity for lineitem service * add generate test to ensure that includes_tax is set when returned from price selection strategy * add integration test for generating lineitem including tax * add test for negative tax inclusion * add tests for mixed pricing * add negative test for setting tax exclusivity * restructure the setting of includes_tax on lineitems * fix: update cwd to be correct in cart test * feat(medusa): Line item totals calculations (#2123) * feat(medusa): Update totals and tax calculation way to calculate the totals * feat(medusa): remove region feetching from decorate total * feat(medusa): cleanup * test(medusa): fix tax calculation tests * comment * test(integration): cleanup * test(integration): cleanup * fix(medusa): return service missing await * feat(medusa): cleanup * feat(medusa): cleanup * test(integration): fix data * feat(medusa): improve tax calculation readability * test(medusa): improve tax calculation structure case Co-authored-by: Sebastian Rindom <skrindom@gmail.com> * Feat(medusa): tax inclusive pricing in shipping method tax (#2125) * initial implementation and test * include tax inclusive calculations for getting shipping options * remove inaccurate comment * remove console log * refactor how prices and taxes are set for shipping methods * fix integration tests * remove verbose flag * fix integration tests * remove console log * format util * use util in price service and tax strategy * fix faulty integration test * undo tax calculation strategy changes in favor or Carlos' pr * undo changes to tax calculation strategy tests * round tax amount * feat(medusa): cleanup calculate tax amount utils and its usage (#2136) * feat(medusa): Refund line totals calculation (#2139) Rely on the update of the following pr https://github.com/medusajs/medusa/pull/2136 **WIP Missing integration tests** **What** Update the totals calculation on the refund line to include the notion of tax inclusive **Test** - Update and add new tests around the refund Fixes CORE-482 * feat(medusa): Tax inclusive discounts calculations (#2137) **What** - Calculate line adjustments correctly taking into account the tax inclusivity - fix totals getLineItemTotals by adjusting the sub total with the original tax amount instead of the tax amount when the unit price includes the taxes **Tests** - The tests create a cart with a percentage discount of 15%, the cart includes 2 items mixing the tax inclusive and validate the items on the result cart as well as the totals on each item. I ve based my calculation validation based on what we have done + some articles around discount apply on price without taxes to validate the output., FIXES CORE-477 * Chore: shipping methods tax inclusive total (#2130) * chore: calculate tax inclusive shipping methods * chore: additional tests and check undefined tax_rate (#2157) * chore: additional tests and check undefined tax_rate * fix: naming + correct price type check * fix: remove price_includes_tax from type * fix: remove price_includes_tax from type Co-authored-by: Philip Korsholm <philip.korsholm@hotmail.com> Co-authored-by: adrien2p <adrien.deperetti@gmail.com> Co-authored-by: Carlos R. L. Rodrigues <rodrigolr@gmail.com> Co-authored-by: Philip Korsholm <88927411+pKorsholm@users.noreply.github.com> Co-authored-by: Sebastian Rindom <skrindom@gmail.com> Co-authored-by: Carlos R. L. Rodrigues <37986729+carlos-r-l-rodrigues@users.noreply.github.com>
211 lines
6.3 KiB
JavaScript
211 lines
6.3 KiB
JavaScript
const path = require("path")
|
|
const { LineItemAdjustment } = require("@medusajs/medusa")
|
|
const setupServer = require("../../../helpers/setup-server")
|
|
const { useApi } = require("../../../helpers/use-api")
|
|
const { initDb, useDb } = require("../../../helpers/use-db")
|
|
const cartSeeder = require("../../helpers/cart-seeder")
|
|
const { simpleCartFactory, simpleLineItemFactory } = require("../../factories")
|
|
const {
|
|
simpleDiscountFactory,
|
|
} = require("../../factories/simple-discount-factory")
|
|
|
|
jest.setTimeout(30000)
|
|
|
|
describe("Line Item Adjustments", () => {
|
|
let dbConnection
|
|
let medusaProcess
|
|
|
|
const doAfterEach = async () => {
|
|
const db = useDb()
|
|
return await db.teardown()
|
|
}
|
|
|
|
beforeAll(async () => {
|
|
const cwd = path.resolve(path.join(__dirname, "..", ".."))
|
|
dbConnection = await initDb({ cwd })
|
|
medusaProcess = await setupServer({ cwd })
|
|
})
|
|
|
|
afterAll(async () => {
|
|
const db = useDb()
|
|
await db.shutdown()
|
|
medusaProcess.kill()
|
|
})
|
|
|
|
describe("Tests database constraints", () => {
|
|
let cart
|
|
let discount
|
|
const lineItemId = "line-test"
|
|
beforeEach(async () => {
|
|
await cartSeeder(dbConnection)
|
|
discount = await simpleDiscountFactory(dbConnection, {
|
|
code: "MEDUSATEST",
|
|
id: "discount-test",
|
|
rule: {
|
|
value: 100,
|
|
type: "fixed",
|
|
allocation: "total",
|
|
},
|
|
regions: ["test-region"],
|
|
})
|
|
cart = await simpleCartFactory(
|
|
dbConnection,
|
|
{
|
|
customer: "test-customer",
|
|
id: "cart-test",
|
|
line_items: [
|
|
{
|
|
id: lineItemId,
|
|
variant_id: "test-variant",
|
|
cart_id: "cart-test",
|
|
unit_price: 1000,
|
|
quantity: 1,
|
|
adjustments: [
|
|
{
|
|
amount: 10,
|
|
discount_id: discount.id,
|
|
description: "discount",
|
|
item_id: lineItemId,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
region: "test-region",
|
|
shipping_address: {
|
|
address_1: "test",
|
|
country_code: "us",
|
|
first_name: "chris",
|
|
last_name: "rock",
|
|
postal_code: "101",
|
|
},
|
|
shipping_methods: [
|
|
{
|
|
shipping_option: "test-option",
|
|
},
|
|
],
|
|
},
|
|
100
|
|
)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
await doAfterEach()
|
|
})
|
|
|
|
describe("Given an existing line item, a discount, and a line item adjustment for both", () => {
|
|
describe("When creating an adjustment for another line item w. same discount", () => {
|
|
test("Then should create an adjustment", async () => {
|
|
const createLineItemWithAdjustment = async () => {
|
|
return await simpleLineItemFactory(dbConnection, {
|
|
id: "line-test-2",
|
|
variant_id: "test-variant-quantity",
|
|
cart_id: "test-cart",
|
|
unit_price: 1000,
|
|
quantity: 1,
|
|
adjustments: [
|
|
{
|
|
amount: 10,
|
|
discount_id: discount.id,
|
|
description: "discount",
|
|
item_id: "line-test-2",
|
|
},
|
|
],
|
|
})
|
|
}
|
|
|
|
await expect(createLineItemWithAdjustment()).resolves.toEqual(
|
|
expect.anything()
|
|
)
|
|
})
|
|
})
|
|
|
|
describe("When creating an adjustment for another line item w. null discount", () => {
|
|
test("Then should create an adjustment", async () => {
|
|
const createAdjustmentNullDiscount = async () => {
|
|
return await dbConnection.manager.insert(LineItemAdjustment, {
|
|
id: "lia-1",
|
|
item_id: lineItemId,
|
|
amount: 35,
|
|
description: "custom discount",
|
|
discount_id: null,
|
|
})
|
|
}
|
|
|
|
await expect(createAdjustmentNullDiscount()).resolves.toEqual(
|
|
expect.anything()
|
|
)
|
|
})
|
|
})
|
|
|
|
describe("When creating multiple adjustments w. a null discount_id", () => {
|
|
test("Then should create multiple adjustments", async () => {
|
|
const createAdjustmentsNullDiscount = async () => {
|
|
await dbConnection.manager.insert(LineItemAdjustment, {
|
|
id: "lia-1",
|
|
item_id: lineItemId,
|
|
amount: 35,
|
|
description: "custom discount",
|
|
discount_id: null,
|
|
})
|
|
return await dbConnection.manager.insert(LineItemAdjustment, {
|
|
id: "lia-2",
|
|
item_id: lineItemId,
|
|
amount: 100,
|
|
description: "custom discount",
|
|
discount_id: null,
|
|
})
|
|
}
|
|
|
|
await expect(createAdjustmentsNullDiscount()).resolves.toEqual(
|
|
expect.anything()
|
|
)
|
|
})
|
|
})
|
|
|
|
describe("When creating an adjustment w. for same line item and different discount", () => {
|
|
test("Then should create an adjustment", async () => {
|
|
const createAdjustment = async () => {
|
|
await simpleDiscountFactory(dbConnection, {
|
|
code: "ANOTHER",
|
|
id: "discount-2",
|
|
rule: {
|
|
value: 10,
|
|
type: "percentage",
|
|
allocation: "item",
|
|
},
|
|
regions: ["test-region"],
|
|
})
|
|
|
|
return await dbConnection.manager.insert(LineItemAdjustment, {
|
|
id: "lia-1",
|
|
item_id: lineItemId,
|
|
amount: 10,
|
|
description: "discount",
|
|
discount_id: "discount-2",
|
|
})
|
|
}
|
|
|
|
await expect(createAdjustment()).resolves.toEqual(expect.anything())
|
|
})
|
|
})
|
|
|
|
describe("When creating an adjustment w. existing line item and discount pair", () => {
|
|
test("Then should throw a duplicate error", async () => {
|
|
const createDuplicateAdjustment = async () =>
|
|
await dbConnection.manager.insert(LineItemAdjustment, {
|
|
id: "lia-1",
|
|
item_id: lineItemId,
|
|
amount: 20,
|
|
description: "discount",
|
|
discount_id: discount.id,
|
|
})
|
|
|
|
await expect(createDuplicateAdjustment()).rejects.toEqual(
|
|
expect.objectContaining({ code: "23505" })
|
|
)
|
|
})
|
|
})
|
|
})
|
|
})
|
|
})
|