feat(medusa): Tax-inclusive pricing #2131

olivermrbl · 2022-08-30T16:46:32Z

What

Support gross pricing and make is easier for merchants to manage prices across different regions

Composed of multiple PRs related to tax-inclusive pricing. See git history.

…shipping-options should allow to pass includes_tax

…ption (#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 <[email protected]>

* 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

olivermrbl · 2022-08-30T17:27:24Z

cc @carlos-r-l-rodrigues @adrien2p @fPolic @kasperkristensen @pKorsholm

* 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 <[email protected]>

* 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

Rely on the update of the following pr #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

**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: calculate tax inclusive shipping methods

carlos-r-l-rodrigues

There will be more tests for the shippingMethod Totals, but that can be pushed later on to the develop branch.

adrien2p · 2022-09-06T16:21:33Z

we need to finish that one #2154, otherwise it should be good after

srindom

LGTM w. comments - don't mind if we wait to address these on develop

packages/medusa/src/api/routes/admin/currency/index.ts

packages/medusa/src/strategies/price-selection.ts

packages/medusa/src/types/pricing.ts

carlos-r-l-rodrigues · 2022-09-06T16:28:15Z

we need to finish that one #2154, otherwise it should be good after

We only have additional tests there no? There is no change to the behavior.

adrien2p · 2022-09-06T17:05:09Z

we need to finish that one #2154, otherwise it should be good after

We only have additional tests there no? There is no change to the behavior.

There is a bug fix in the totals service:

if tax_rate is undefined and the object is an order then it validate the first condition since undefined is strictly different than null

* chore: additional tests and check undefined tax_rate

* 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 <[email protected]> * 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 <[email protected]> * 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 #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 <[email protected]> Co-authored-by: adrien2p <[email protected]> Co-authored-by: Carlos R. L. Rodrigues <[email protected]> Co-authored-by: Philip Korsholm <[email protected]> Co-authored-by: Sebastian Rindom <[email protected]> Co-authored-by: Carlos R. L. Rodrigues <[email protected]>

* docs for tax-inclusive pricing * changes based on feedback * changes based on feedback * fix link * fix: make prices optional param when updating a variant (#2155) **Why** - It should be possible to update variant props without having to send the prices array with every update * feat(medusa): Tax-inclusive pricing (#2131) * 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 <[email protected]> * 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 <[email protected]> * 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 #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 <[email protected]> Co-authored-by: adrien2p <[email protected]> Co-authored-by: Carlos R. L. Rodrigues <[email protected]> Co-authored-by: Philip Korsholm <[email protected]> Co-authored-by: Sebastian Rindom <[email protected]> Co-authored-by: Carlos R. L. Rodrigues <[email protected]> * Remove unused QueryBuilderService (#2104) **Issue number:** #2068 **What:** - removed unused query-builder service files - medusa/src/services/query-builder.js - medusa/src/services/__mocks__/query-builder.js - deleted export from medusa/src/services/index.ts - (extra) deleted documentation files related to QueryBuilderService (QueryBuilderService.md) * docs for tax-inclusive pricing * changes based on feedback * changes based on feedback * feat(medusa-fulfillment-webshipper): Support personal customs no in orders (#2167) * feat(webshipper): support personal customs no in orders * docs: update readme with personal customs number info * fix(medusa-file-spaces): return `fileKey` for Spaces upload (#2171) **What** - return `fileKey` in the response after the file is uploaded to Spaces Co-authored-by: Oliver Windall Juhl <[email protected]> * fix(medusa): Export/import fixes including export fields that contains new line char (#2150) * feat(medusa-js,medusa-react,medusa): Add missing Currency endpoints (#2185) * fix(medusa): Resent notification replaces parent notification * chore: Bump medusa-file-minio * fix(medusa): allow address updates on carts w/o existing address (#2176) * chore: Bump minor version of plugins * chore: Centralise ESLint rules (#2162) * chore: centrilize eslint rules * feat: order editing data model (#2184) **What** - add order editing entities - add repositories - add a feature flag for the order editing feature - add the migrations file RESOLVES CORE-490 * fix link * fix(medusa): Check for Sales Channel on product import (#2202) * docs: change title in Create a Service documentation (#2201) Change title in Create a Service documentation * chore(release): Publish * added links to sidebar Co-authored-by: Sebastian Rindom <[email protected]> Co-authored-by: Oliver Windall Juhl <[email protected]> Co-authored-by: Philip Korsholm <[email protected]> Co-authored-by: adrien2p <[email protected]> Co-authored-by: Carlos R. L. Rodrigues <[email protected]> Co-authored-by: Philip Korsholm <[email protected]> Co-authored-by: Carlos R. L. Rodrigues <[email protected]> Co-authored-by: Dorian <[email protected]> Co-authored-by: Frane Polić <[email protected]> Co-authored-by: Kasper Fabricius Kristensen <[email protected]> Co-authored-by: Bhargava Prabu Reddy <[email protected]> Co-authored-by: olivermrbl <[email protected]> Co-authored-by: sabakhilji <[email protected]>

pKorsholm and others added 30 commits August 3, 2022 09:24

add feature flag for tax inclusive pricing

88f6b92

update db model for TIP

a95198a

add migration

1e8dea6

set featureflag column decorators

914e890

remove unused prop

2929a9a

update tests to reflect feature_flags as any array

efed0e2

fix types

a730b12

reference key from featureFlag file

bf5fb70

use feature flag key in models

a2bcf44

fix copy paste mistake

350e9a5

unify spelling

f12618c

Create gorgeous-experts-guess.md

4171893

manage conflict

bde3d16

feat(medusa): create/update endpoints of currency/region/price-lists/…

337ae1a

…shipping-options should allow to pass includes_tax

test(integration): continue to add some integration test

273f4de

test(integration): continue to add some integration test

2d76b41

test(unit): Fix region service tests

5ba36ab

fix(medusa): API unit tests flags management

a63f505

feat(medusa): Minor cleanup

f824127

style(medusa): Fix typo

7c2dfc4

fix(medusa): rebase

16fde7c

feat(medusa): Replace old tag with the new one

cb6738e

feat(medusa): revert flag

873767a

feat(medusa): Cleanup

012da52

feat(medusa): feedback

91d254f

feat(medusa): Rename currency retrieve method

e0cee0c

test(medudsa): fix unit tests

d6db1ad

chore(medusa): fix oas

4082608

olivermrbl closed this Aug 30, 2022

olivermrbl reopened this Aug 30, 2022

olivermrbl force-pushed the feat/tax-inclusive-pricing-2 branch from faf3b71 to 24a4dfb Compare August 30, 2022 19:13

fix: Merge conflicts with develop

d0f0973

olivermrbl marked this pull request as draft August 31, 2022 08:34

srindom and others added 8 commits August 31, 2022 14:40

fix: update cwd to be correct in cart test

a2c908e

feat(medusa): cleanup calculate tax amount utils and its usage (#2136)

13052a0

Chore: shipping methods tax inclusive total (#2130)

7dd285b

* chore: calculate tax inclusive shipping methods

fix: merge conflicts with develop

ac52ed5

olivermrbl changed the title ~~[WIP] Tax-inclusive pricing~~ feat(medusa): Tax-inclusive pricing Sep 6, 2022

olivermrbl marked this pull request as ready for review September 6, 2022 10:45

olivermrbl requested a review from a team September 6, 2022 10:45

Merge branch 'develop' into feat/tax-inclusive-pricing-2

69d1a8f

carlos-r-l-rodrigues approved these changes Sep 6, 2022

View reviewed changes

srindom approved these changes Sep 6, 2022

View reviewed changes

packages/medusa/src/api/routes/admin/currency/index.ts Outdated Show resolved Hide resolved

packages/medusa/src/strategies/price-selection.ts Outdated Show resolved Hide resolved

packages/medusa/src/types/pricing.ts Outdated Show resolved Hide resolved

carlos-r-l-rodrigues and others added 4 commits September 6, 2022 14:51

chore: additional tests and check undefined tax_rate (#2157)

5a2407f

* chore: additional tests and check undefined tax_rate

fix: naming + correct price type check

03cc6a5

fix: remove price_includes_tax from type

10f402f

fix: remove price_includes_tax from type

03f031f

olivermrbl merged commit cbb7dd9 into develop Sep 7, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(medusa): Tax-inclusive pricing #2131

feat(medusa): Tax-inclusive pricing #2131

olivermrbl commented Aug 30, 2022 •

edited

Loading

olivermrbl commented Aug 30, 2022

carlos-r-l-rodrigues left a comment

adrien2p commented Sep 6, 2022

srindom left a comment

carlos-r-l-rodrigues commented Sep 6, 2022

adrien2p commented Sep 6, 2022 •

edited

Loading

feat(medusa): Tax-inclusive pricing #2131

feat(medusa): Tax-inclusive pricing #2131

Conversation

olivermrbl commented Aug 30, 2022 • edited Loading

olivermrbl commented Aug 30, 2022

carlos-r-l-rodrigues left a comment

Choose a reason for hiding this comment

adrien2p commented Sep 6, 2022

srindom left a comment

Choose a reason for hiding this comment

carlos-r-l-rodrigues commented Sep 6, 2022

adrien2p commented Sep 6, 2022 • edited Loading

olivermrbl commented Aug 30, 2022 •

edited

Loading

adrien2p commented Sep 6, 2022 •

edited

Loading