* 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>
392 lines
9.7 KiB
JavaScript
392 lines
9.7 KiB
JavaScript
const path = require("path")
|
|
const { Region } = require("@medusajs/medusa")
|
|
|
|
const setupServer = require("../../../helpers/setup-server")
|
|
const startServerWithEnvironment = require("../../../helpers/start-server-with-environment").default
|
|
const { useApi } = require("../../../helpers/use-api")
|
|
const { initDb, useDb } = require("../../../helpers/use-db")
|
|
const adminSeeder = require("../../helpers/admin-seeder")
|
|
const { simpleRegionFactory } = require("../../factories");
|
|
|
|
const adminReqConfig = {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
|
|
jest.setTimeout(30000)
|
|
|
|
describe("/admin/regions", () => {
|
|
let medusaProcess
|
|
let dbConnection
|
|
const cwd = path.resolve(path.join(__dirname, "..", ".."))
|
|
|
|
beforeAll(async () => {
|
|
dbConnection = await initDb({ cwd })
|
|
medusaProcess = await setupServer({ cwd })
|
|
})
|
|
|
|
afterAll(async () => {
|
|
const db = useDb()
|
|
await db.shutdown()
|
|
|
|
medusaProcess.kill()
|
|
})
|
|
|
|
describe("Remove region from country on delete", () => {
|
|
beforeEach(async () => {
|
|
await adminSeeder(dbConnection)
|
|
const manager = dbConnection.manager
|
|
await manager.insert(Region, {
|
|
id: "test-region",
|
|
name: "Test Region",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
})
|
|
|
|
await manager.query(
|
|
`UPDATE "country" SET region_id='test-region' WHERE iso_2 = 'us'`
|
|
)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("successfully creates a region with countries from a previously deleted region", async () => {
|
|
const api = useApi()
|
|
|
|
const response = await api
|
|
.delete(`/admin/regions/test-region`, {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.status).toEqual(200)
|
|
expect(response.data).toMatchSnapshot({
|
|
id: "test-region",
|
|
object: "region",
|
|
deleted: true,
|
|
})
|
|
|
|
const newReg = await api.post(
|
|
`/admin/regions`,
|
|
{
|
|
name: "World",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
payment_providers: ["test-pay"],
|
|
fulfillment_providers: ["test-ful"],
|
|
countries: ["us"],
|
|
},
|
|
{
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
)
|
|
|
|
expect(newReg.status).toEqual(200)
|
|
expect(newReg.data.region).toMatchSnapshot({
|
|
id: expect.any(String),
|
|
name: "World",
|
|
currency_code: "usd",
|
|
countries: [
|
|
{
|
|
region_id: expect.any(String),
|
|
},
|
|
],
|
|
tax_rate: 0,
|
|
fulfillment_providers: [
|
|
{
|
|
id: "test-ful",
|
|
is_installed: true,
|
|
},
|
|
],
|
|
created_at: expect.any(String),
|
|
updated_at: expect.any(String),
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("GET /admin/regions", () => {
|
|
beforeEach(async () => {
|
|
const manager = dbConnection.manager
|
|
await adminSeeder(dbConnection)
|
|
await manager.insert(Region, {
|
|
id: "test-region",
|
|
name: "Test Region",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
})
|
|
await manager.insert(Region, {
|
|
id: "test-region-deleted",
|
|
name: "Test Region",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
deleted_at: new Date(),
|
|
})
|
|
await manager.insert(Region, {
|
|
id: "test-region-updated",
|
|
name: "Test Region updated",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
updated_at: new Date(),
|
|
})
|
|
await manager.insert(Region, {
|
|
id: "test-region-updated-1",
|
|
name: "Test Region updated 1",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
updated_at: new Date("10/10/2000"),
|
|
})
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("only returns non-deleted regions", async () => {
|
|
const api = useApi()
|
|
|
|
const response = await api
|
|
.get(`/admin/regions`, {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.data.regions).toHaveLength(3)
|
|
expect(response.data.regions).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
id: "test-region-updated-1",
|
|
}),
|
|
expect.objectContaining({
|
|
id: "test-region",
|
|
}),
|
|
expect.objectContaining({
|
|
id: "test-region-updated",
|
|
}),
|
|
])
|
|
)
|
|
expect(response.status).toEqual(200)
|
|
})
|
|
|
|
it("filters correctly on update", async () => {
|
|
const api = useApi()
|
|
|
|
const response = await api
|
|
.get(`/admin/regions?updated_at[gt]=10-10-2005`, {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.data.regions).toHaveLength(2)
|
|
expect(response.data.regions).toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
id: "test-region",
|
|
}),
|
|
expect.objectContaining({
|
|
id: "test-region-updated",
|
|
}),
|
|
])
|
|
)
|
|
expect(response.status).toEqual(200)
|
|
})
|
|
})
|
|
|
|
describe("DELETE /admin/regions/:id", () => {
|
|
beforeEach(async () => {
|
|
await adminSeeder(dbConnection)
|
|
const manager = dbConnection.manager
|
|
await manager.insert(Region, {
|
|
id: "test-region",
|
|
name: "Test Region",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
})
|
|
|
|
await manager.query(
|
|
`UPDATE "country" SET region_id='test-region' WHERE iso_2 = 'us'`
|
|
)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("successfully deletes a region with a fulfillment provider", async () => {
|
|
const api = useApi()
|
|
|
|
// add fulfillment provider to the region
|
|
await api.post(
|
|
"/admin/regions/test-region",
|
|
{
|
|
fulfillment_providers: ["test-ful"],
|
|
},
|
|
{
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
)
|
|
|
|
const response = await api
|
|
.delete(`/admin/regions/test-region`, {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.data).toEqual({
|
|
id: "test-region",
|
|
object: "region",
|
|
deleted: true,
|
|
})
|
|
expect(response.status).toEqual(200)
|
|
})
|
|
|
|
it("fails to create when countries exists in different region", async () => {
|
|
const api = useApi()
|
|
|
|
try {
|
|
await api.post(
|
|
`/admin/regions`,
|
|
{
|
|
name: "World",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
payment_providers: ["test-pay"],
|
|
fulfillment_providers: ["test-ful"],
|
|
countries: ["us"],
|
|
},
|
|
{
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
)
|
|
} catch (error) {
|
|
expect(error.response.status).toEqual(422)
|
|
expect(error.response.data.message).toEqual(
|
|
"United States already exists in region test-region"
|
|
)
|
|
}
|
|
})
|
|
})
|
|
})
|
|
|
|
describe("[MEDUSA_FF_TAX_INCLUSIVE_PRICING] /admin/regions", () => {
|
|
let medusaProcess
|
|
let dbConnection
|
|
|
|
beforeAll(async () => {
|
|
const cwd = path.resolve(path.join(__dirname, "..", ".."))
|
|
const [process, connection] = await startServerWithEnvironment({
|
|
cwd,
|
|
env: { MEDUSA_FF_TAX_INCLUSIVE_PRICING: true },
|
|
verbose: false,
|
|
})
|
|
dbConnection = connection
|
|
medusaProcess = process
|
|
})
|
|
|
|
afterAll(async () => {
|
|
const db = useDb()
|
|
await db.shutdown()
|
|
|
|
medusaProcess.kill()
|
|
})
|
|
|
|
describe("POST /admin/regions/:id", () => {
|
|
const region1TaxInclusiveId = "region-1-tax-inclusive"
|
|
|
|
beforeEach(async () => {
|
|
try {
|
|
await adminSeeder(dbConnection)
|
|
await simpleRegionFactory(dbConnection, {
|
|
id: region1TaxInclusiveId,
|
|
countries: ["fr"],
|
|
})
|
|
} catch (err) {
|
|
console.log(err)
|
|
throw err
|
|
}
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("should allow to create a region that includes tax", async function () {
|
|
const api = useApi()
|
|
|
|
const payload = {
|
|
name: "region-including-taxes",
|
|
currency_code: "usd",
|
|
tax_rate: 0,
|
|
payment_providers: ["test-pay"],
|
|
fulfillment_providers: ["test-ful"],
|
|
countries: ["us"],
|
|
includes_tax: true,
|
|
}
|
|
|
|
let response = await api
|
|
.post(`/admin/regions`, payload, adminReqConfig)
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.data.region).toEqual(
|
|
expect.objectContaining({
|
|
id: expect.any(String),
|
|
includes_tax: true,
|
|
name: "region-including-taxes",
|
|
})
|
|
)
|
|
});
|
|
|
|
it("should allow to update a region that includes tax", async function () {
|
|
const api = useApi()
|
|
let response = await api
|
|
.get(`/admin/regions/${region1TaxInclusiveId}`, adminReqConfig)
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.data.region.includes_tax).toBe(false)
|
|
|
|
response = await api.post(
|
|
`/admin/regions/${region1TaxInclusiveId}`,
|
|
{
|
|
includes_tax: true,
|
|
},
|
|
adminReqConfig,
|
|
).catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.data.region.includes_tax).toBe(true)
|
|
});
|
|
})
|
|
}) |