* 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>
353 lines
8.7 KiB
JavaScript
353 lines
8.7 KiB
JavaScript
const path = require("path")
|
|
|
|
const setupServer = require("../../../helpers/setup-server")
|
|
const { useApi } = require("../../../helpers/use-api")
|
|
const { initDb, useDb } = require("../../../helpers/use-db")
|
|
|
|
const orderSeeder = require("../../helpers/order-seeder")
|
|
const swapSeeder = require("../../helpers/swap-seeder")
|
|
const adminSeeder = require("../../helpers/admin-seeder")
|
|
|
|
const {
|
|
simpleProductFactory,
|
|
simpleCartFactory,
|
|
simpleDiscountFactory,
|
|
simpleRegionFactory,
|
|
simpleShippingOptionFactory,
|
|
} = require("../../factories")
|
|
const {
|
|
simpleCustomerFactory,
|
|
} = require("../../factories/simple-customer-factory")
|
|
|
|
jest.setTimeout(30000)
|
|
|
|
describe("/admin/swaps", () => {
|
|
let medusaProcess
|
|
let dbConnection
|
|
|
|
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("GET /admin/swaps/:id", () => {
|
|
beforeEach(async () => {
|
|
await adminSeeder(dbConnection)
|
|
await orderSeeder(dbConnection)
|
|
await swapSeeder(dbConnection)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("gets a swap with cart and totals", async () => {
|
|
const api = useApi()
|
|
|
|
const response = await api
|
|
.get("/admin/swaps/test-swap", {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
expect(response.status).toEqual(200)
|
|
expect(response.data.swap).toEqual(
|
|
expect.objectContaining({
|
|
id: "test-swap",
|
|
})
|
|
)
|
|
|
|
expect(response.data.swap.cart).toEqual(
|
|
expect.objectContaining({
|
|
id: "test-cart-w-swap",
|
|
shipping_total: 1000,
|
|
subtotal: 1000,
|
|
total: 2000,
|
|
})
|
|
)
|
|
expect(response.data.swap.cart).toHaveProperty("discount_total")
|
|
expect(response.data.swap.cart).toHaveProperty("gift_card_total")
|
|
})
|
|
|
|
it("gets a swap with a discount", async () => {
|
|
const api = useApi()
|
|
|
|
const response = await api
|
|
.get("/admin/swaps/disc-swap", {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
expect(response.status).toEqual(200)
|
|
expect(response.data.swap).toEqual(
|
|
expect.objectContaining({
|
|
id: "disc-swap",
|
|
})
|
|
)
|
|
|
|
expect(response.data.swap.cart).toEqual(
|
|
expect.objectContaining({
|
|
id: "disc-swap-cart",
|
|
discount_total: -800,
|
|
shipping_total: 1000,
|
|
subtotal: -8000,
|
|
total: -6200,
|
|
})
|
|
)
|
|
})
|
|
})
|
|
|
|
describe("GET /admin/swaps/", () => {
|
|
beforeEach(async () => {
|
|
await adminSeeder(dbConnection)
|
|
await orderSeeder(dbConnection)
|
|
await swapSeeder(dbConnection)
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("lists all swaps", async () => {
|
|
const api = useApi()
|
|
|
|
const response = await api
|
|
.get("/admin/swaps/", {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
expect(response.status).toEqual(200)
|
|
expect(response.data).toHaveProperty("count")
|
|
expect(response.data.offset).toBe(0)
|
|
expect(response.data.limit).toBe(50)
|
|
expect(response.data.swaps).toContainEqual(
|
|
expect.objectContaining({
|
|
id: "test-swap",
|
|
})
|
|
)
|
|
})
|
|
})
|
|
|
|
describe("Complete swap flow", () => {
|
|
beforeEach(async () => {
|
|
try {
|
|
await adminSeeder(dbConnection)
|
|
} catch (err) {
|
|
console.log(err)
|
|
throw err
|
|
}
|
|
})
|
|
|
|
afterEach(async () => {
|
|
const db = useDb()
|
|
await db.teardown()
|
|
})
|
|
|
|
it("completes swap and ensures difference due", async () => {
|
|
// ********* FACTORIES *********
|
|
const prodA = await simpleProductFactory(dbConnection, {
|
|
id: "prod-a",
|
|
variants: [
|
|
{ id: "prod-a-var", prices: [{ amount: 1000, currency: "dkk" }] },
|
|
],
|
|
})
|
|
|
|
await simpleProductFactory(dbConnection, {
|
|
id: "prod-b",
|
|
variants: [
|
|
{ id: "prod-b-var", prices: [{ amount: 1000, currency: "dkk" }] },
|
|
],
|
|
})
|
|
|
|
await simpleRegionFactory(dbConnection, {
|
|
id: "test-region",
|
|
currency_code: "dkk",
|
|
})
|
|
|
|
await simpleDiscountFactory(dbConnection, {
|
|
id: "test-discount",
|
|
regions: ["test-region"],
|
|
code: "TEST",
|
|
rule: {
|
|
type: "percentage",
|
|
value: "10",
|
|
allocation: "total",
|
|
conditions: [
|
|
{
|
|
type: "products",
|
|
operator: "in",
|
|
products: [prodA.id],
|
|
},
|
|
],
|
|
},
|
|
})
|
|
|
|
await simpleCustomerFactory(dbConnection, {
|
|
id: "test-customer",
|
|
email: "test@customer.com",
|
|
})
|
|
|
|
const so = await simpleShippingOptionFactory(dbConnection, {
|
|
region_id: "test-region",
|
|
})
|
|
|
|
await simpleCartFactory(dbConnection, {
|
|
customer: "test-customer",
|
|
id: "cart-test",
|
|
line_items: [
|
|
{
|
|
id: "line-item",
|
|
variant_id: "prod-a-var",
|
|
cart_id: "cart-test",
|
|
unit_price: 1000,
|
|
quantity: 1,
|
|
},
|
|
],
|
|
region: "test-region",
|
|
shipping_address: {
|
|
address_1: "test",
|
|
country_code: "us",
|
|
first_name: "chris",
|
|
last_name: "rock",
|
|
postal_code: "101",
|
|
},
|
|
})
|
|
|
|
const api = useApi()
|
|
|
|
// ********* PREPARE CART *********
|
|
|
|
try {
|
|
await api.post("/store/carts/cart-test", {
|
|
discounts: [{ code: "TEST" }],
|
|
})
|
|
} catch (error) {
|
|
console.log(error)
|
|
}
|
|
|
|
await api.post("/store/carts/cart-test/shipping-methods", {
|
|
option_id: so.id,
|
|
data: {},
|
|
})
|
|
await api.post("/store/carts/cart-test/payment-sessions")
|
|
await api.post("/store/carts/cart-test/payment-session", {
|
|
provider_id: "test-pay",
|
|
})
|
|
|
|
// ********* COMPLETE CART *********
|
|
const completedOrder = await api.post("/store/carts/cart-test/complete")
|
|
|
|
// ********* PREPARE ORDER *********
|
|
const orderId = completedOrder.data.data.id
|
|
const fulfilledOrder = await api.post(
|
|
`/admin/orders/${orderId}/fulfillment`,
|
|
{
|
|
items: [{ item_id: "line-item", quantity: 1 }],
|
|
},
|
|
{
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
)
|
|
|
|
const fulfillmentId = fulfilledOrder.data.order.fulfillments[0].id
|
|
|
|
await api.post(
|
|
`/admin/orders/${orderId}/shipment`,
|
|
{
|
|
fulfillment_id: fulfillmentId,
|
|
},
|
|
{
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
)
|
|
|
|
await api.post(
|
|
`/admin/orders/${orderId}/capture`,
|
|
{},
|
|
{
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
)
|
|
|
|
// ********* CREATE SWAP *********
|
|
const createSwap = await api.post(
|
|
`/admin/orders/${completedOrder.data.data.id}/swaps`,
|
|
{
|
|
return_items: [
|
|
{
|
|
item_id: "line-item",
|
|
quantity: 1,
|
|
},
|
|
],
|
|
additional_items: [{ variant_id: "prod-b-var", quantity: 1 }],
|
|
},
|
|
{
|
|
headers: {
|
|
authorization: "Bearer test_token",
|
|
},
|
|
}
|
|
)
|
|
|
|
let swap = createSwap.data.order.swaps[0]
|
|
|
|
// ********* PREPARE SWAP CART *********
|
|
await api.post(`/store/carts/${swap.cart_id}/shipping-methods`, {
|
|
option_id: so.id,
|
|
data: {},
|
|
})
|
|
|
|
await api.post(`/store/carts/${swap.cart_id}/payment-sessions`)
|
|
await api.post(`/store/carts/${swap.cart_id}/payment-session`, {
|
|
provider_id: "test-pay",
|
|
})
|
|
|
|
// ********* COMPLETE SWAP CART *********
|
|
await api.post(`/store/carts/${swap.cart_id}/complete`)
|
|
|
|
swap = await api
|
|
.get(`/admin/swaps/${swap.id}`, {
|
|
headers: {
|
|
Authorization: "Bearer test_token",
|
|
},
|
|
})
|
|
.catch((err) => {
|
|
console.log(err)
|
|
})
|
|
|
|
const swapCart = await api.get(
|
|
`/store/carts/${swap.data.swap.cart_id}`,
|
|
{}
|
|
)
|
|
|
|
// ********* VALIDATE *********
|
|
expect(swap.data.swap.difference_due).toBe(swapCart.data.cart.total)
|
|
})
|
|
})
|
|
})
|