asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: adds tax calculation to product pricing (#1354)

Browse Source 
* fix: adds tax calculation to product pricing

* fix: dedupe

* fix: merge inconsistencies

* fix: merge inconsistencies
This commit is contained in:
Sebastian Rindom
2022-06-14 10:11:18 +02:00
committed by GitHub
parent 9a3ff32b42
commit 14366f536d
31 changed files with 792 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/api/__tests__/admin/__snapshots__/product.js.snap
+45
View File
@@ -79,6 +79,8 @@ Array [
"allow_backorder": false,
"barcode": "test-barcode",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean",
@@ -105,6 +107,8 @@ Array [
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -123,6 +127,7 @@ Array [
],
"product_id": StringMatching /\\^test-\\*/,
"sku": "test-sku",
"tax_rates": null,
"title": "Test variant",
"upc": "test-upc",
"updated_at": Any<String>,
@@ -133,6 +138,8 @@ Array [
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean2",
@@ -159,6 +166,8 @@ Array [
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -177,6 +186,7 @@ Array [
],
"product_id": StringMatching /\\^test-\\*/,
"sku": "test-sku2",
"tax_rates": null,
"title": "Test variant rank (2)",
"upc": "test-upc2",
"updated_at": Any<String>,
@@ -187,6 +197,8 @@ Array [
"allow_backorder": false,
"barcode": "test-barcode 1",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean1",
@@ -213,6 +225,8 @@ Array [
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -231,6 +245,7 @@ Array [
],
"product_id": StringMatching /\\^test-\\*/,
"sku": "test-sku1",
"tax_rates": null,
"title": "Test variant rank (1)",
"upc": "test-upc1",
"updated_at": Any<String>,
@@ -241,6 +256,8 @@ Array [
"allow_backorder": false,
"barcode": "test-barcode-sale",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean-sale",
@@ -267,6 +284,8 @@ Array [
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 1000,
@@ -285,6 +304,7 @@ Array [
],
"product_id": StringMatching /\\^test-\\*/,
"sku": "test-sku-sale",
"tax_rates": null,
"title": "Test variant",
"upc": "test-upc-sale",
"updated_at": Any<String>,
@@ -353,6 +373,8 @@ Array [
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean4",
@@ -379,6 +401,8 @@ Array [
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -397,6 +421,7 @@ Array [
],
"product_id": StringMatching /\\^test-\\*/,
"sku": "test-sku4",
"tax_rates": null,
"title": "Test variant rank (2)",
"upc": "test-upc4",
"updated_at": Any<String>,
@@ -407,6 +432,8 @@ Array [
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean3",
@@ -433,6 +460,8 @@ Array [
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -451,6 +480,7 @@ Array [
],
"product_id": StringMatching /\\^test-\\*/,
"sku": "test-sku3",
"tax_rates": null,
"title": "Test variant rank (2)",
"upc": "test-upc3",
"updated_at": Any<String>,
@@ -609,6 +639,8 @@ Array [
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": null,
@@ -635,6 +667,8 @@ Array [
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -653,6 +687,7 @@ Array [
],
"product_id": StringMatching /\\^prod_\\*/,
"sku": null,
"tax_rates": null,
"title": "Test variant",
"upc": null,
"updated_at": Any<String>,
@@ -769,6 +804,8 @@ Object {
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": null,
@@ -805,6 +842,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -851,6 +890,7 @@ Object {
],
"product_id": StringMatching /\\^prod_\\*/,
"sku": null,
"tax_rates": null,
"title": "Test variant",
"upc": null,
"updated_at": Any<String>,
@@ -933,6 +973,8 @@ Object {
"allow_backorder": false,
"barcode": "test-barcode",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean",
@@ -959,6 +1001,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 75,
@@ -977,6 +1021,7 @@ Object {
],
"product_id": "test-product",
"sku": "test-sku",
"tax_rates": null,
"title": "Test variant",
"upc": "test-upc",
"updated_at": Any<String>,
integration-tests/api/__tests__/admin/product.js
+1 -1
View File
@@ -22,7 +22,7 @@ describe("/admin/products", () => {
beforeAll(async () => {
const cwd = path.resolve(path.join(__dirname, "..", ".."))
dbConnection = await initDb({ cwd })
medusaProcess = await setupServer({ cwd })
medusaProcess = await setupServer({ cwd, verbose: false })
})
afterAll(async () => {
integration-tests/api/__tests__/store/__snapshots__/product-variants.js.snap
+31
View File
@@ -6,6 +6,8 @@ Object {
"allow_backorder": false,
"barcode": "test-barcode",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean",
@@ -32,6 +34,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -51,6 +55,7 @@ Object {
"product": Any<Object>,
"product_id": "test-product",
"sku": "test-sku",
"tax_rates": null,
"title": "Test variant",
"upc": "test-upc",
"updated_at": Any<String>,
@@ -66,7 +71,9 @@ Object {
"allow_backorder": false,
"barcode": "test-barcode",
"calculated_price": 80,
"calculated_price_incl_tax": null,
"calculated_price_type": "sale",
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean",
@@ -93,6 +100,8 @@ Object {
],
"origin_country": null,
"original_price": 100,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -137,6 +146,7 @@ Object {
"product": Any<Object>,
"product_id": "test-product",
"sku": "test-sku",
"tax_rates": null,
"title": "Test variant",
"upc": "test-upc",
"updated_at": Any<String>,
@@ -153,6 +163,8 @@ Object {
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": null,
@@ -179,6 +191,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -198,6 +212,7 @@ Object {
"product": Any<Object>,
"product_id": Any<String>,
"sku": null,
"tax_rates": null,
"title": "test2",
"upc": null,
"updated_at": Any<String>,
@@ -214,7 +229,9 @@ Object {
"allow_backorder": false,
"barcode": "test-barcode",
"calculated_price": 80,
"calculated_price_incl_tax": 80,
"calculated_price_type": "sale",
"calculated_tax": 0,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean",
@@ -241,6 +258,8 @@ Object {
],
"origin_country": null,
"original_price": 100,
"original_price_incl_tax": 100,
"original_tax": 0,
"prices": Array [
Object {
"amount": 100,
@@ -285,6 +304,13 @@ Object {
"product": Any<Object>,
"product_id": "test-product",
"sku": "test-sku",
"tax_rates": Array [
Object {
"code": "default",
"name": "default",
"rate": 0,
},
],
"title": "Test variant",
"upc": "test-upc",
"updated_at": Any<String>,
@@ -301,6 +327,8 @@ Object {
"allow_backorder": false,
"barcode": "test-barcode",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean",
@@ -327,6 +355,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -346,6 +376,7 @@ Object {
"product": Any<Object>,
"product_id": "test-product",
"sku": "test-sku",
"tax_rates": null,
"title": "Test variant",
"upc": "test-upc",
"updated_at": Any<String>,
integration-tests/api/__tests__/store/__snapshots__/products.js.snap
+20
View File
@@ -131,6 +131,8 @@ Object {
"allow_backorder": false,
"barcode": "test-barcode",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean",
@@ -157,6 +159,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -200,6 +204,7 @@ Object {
],
"product_id": "test-product",
"sku": "test-sku",
"tax_rates": null,
"title": "Test variant",
"upc": "test-upc",
"updated_at": Any<String>,
@@ -210,6 +215,8 @@ Object {
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean2",
@@ -236,6 +243,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -279,6 +288,7 @@ Object {
],
"product_id": "test-product",
"sku": "test-sku2",
"tax_rates": null,
"title": "Test variant rank (2)",
"upc": "test-upc2",
"updated_at": Any<String>,
@@ -289,6 +299,8 @@ Object {
"allow_backorder": false,
"barcode": "test-barcode 1",
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": "test-ean1",
@@ -315,6 +327,8 @@ Object {
],
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -358,6 +372,7 @@ Object {
],
"product_id": "test-product",
"sku": "test-sku1",
"tax_rates": null,
"title": "Test variant rank (1)",
"upc": "test-upc1",
"updated_at": Any<String>,
@@ -385,6 +400,8 @@ Object {
"allow_backorder": false,
"barcode": null,
"calculated_price": null,
"calculated_price_incl_tax": null,
"calculated_tax": null,
"created_at": Any<String>,
"deleted_at": null,
"ean": null,
@@ -399,6 +416,8 @@ Object {
"mid_code": null,
"origin_country": null,
"original_price": null,
"original_price_incl_tax": null,
"original_tax": null,
"prices": Array [
Object {
"amount": 100,
@@ -417,6 +436,7 @@ Object {
],
"product_id": Any<String>,
"sku": null,
"tax_rates": null,
"title": "test-variant",
"upc": null,
"updated_at": Any<String>,
integration-tests/api/__tests__/store/product-variants.js
+1 -1
View File
@@ -15,7 +15,7 @@ describe("/store/variants", () => {
beforeAll(async () => {
const cwd = path.resolve(path.join(__dirname, "..", ".."))
dbConnection = await initDb({ cwd })
medusaProcess = await setupServer({ cwd })
medusaProcess = await setupServer({ cwd, verbose: false })
})
afterAll(async () => {