feat: new tax api (#979)
* feat: add tax calculation strategy (#885) * feat: add tax calculation strategy * fix: adds strategy loader * fix: eslint ignore * chore: cleanup * fix: allow plugin overwrites * fix: allow plugin overwrites * fix: fake region * Update packages/medusa/src/loaders/strategies.ts Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com> Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com> * feat: adds tax related db entities + tax provider (#896) * feat: adds tax related db entities + tax provider * fix: add tax provider tests * fix: add tax service unit tests * fix: tests + migrations * fix: add inherited tax lines * chore: rm tax-line repo * fix: test * fix: pr comments * fix: unit test * feat: totals service to ts (#911) * feat: adds tax related db entities + tax provider * fix: add tax provider tests * fix: add tax service unit tests * fix: tests + migrations * feat: totals service to ts * fix: remove totals.js * fix: add shipping methods * fix: add inherited tax lines * chore: rm tax-line repo * fix: test * fix: tests * fix: tests * fix: unit test * fix: adds TotalsServiceProps * feat: adds integration tests for automatic tax calculation + shipping tax rates (#945) * feat: adds tax related db entities + tax provider * fix: add tax provider tests * fix: add tax service unit tests * fix: tests + migrations * feat: totals service to ts * fix: remove totals.js * fix: add shipping methods * fix: add inherited tax lines * chore: rm tax-line repo * fix: test * fix: tests * fix: tests * fix: unit test * fix: integration test helpers * fix: adds factories + tests automatic tax rates * fix: remove verbose * fix: adds TotalsServiceProps * fix: add shipping tax lines * fix: add migration for shipping taxes * fix: integration tests for shipping taxes * fix: integration tests for shipping taxes * fix: jsdoc types * Feat/manual taxes (#950) * feat: adds tax related db entities + tax provider * fix: add tax provider tests * fix: add tax service unit tests * fix: tests + migrations * feat: totals service to ts * fix: remove totals.js * fix: add shipping methods * fix: add inherited tax lines * chore: rm tax-line repo * fix: test * fix: tests * fix: tests * fix: unit test * fix: integration test helpers * fix: adds factories + tests automatic tax rates * fix: remove verbose * fix: adds TotalsServiceProps * fix: add shipping tax lines * fix: add migration for shipping taxes * fix: integration tests for shipping taxes * fix: integration tests for shipping taxes * fix: add integration tests for manual taxes * fix: cart service - cleanup jsdoc * feat: add /carts/id/taxes to manually calculate taxes * feat: add integration tests for order tax calculations * fix: unit tests * fix: merge * fix: rm verbose * fix: unit tests * fix: object -> cartOrOrder * fix: rounding * Feat/complete order w tax lines (#951) * feat: adds tax related db entities + tax provider * fix: add tax provider tests * fix: add tax service unit tests * fix: tests + migrations * feat: totals service to ts * fix: remove totals.js * fix: add shipping methods * fix: add inherited tax lines * chore: rm tax-line repo * fix: test * fix: tests * fix: tests * fix: unit test * fix: integration test helpers * fix: adds factories + tests automatic tax rates * fix: remove verbose * fix: adds TotalsServiceProps * fix: add shipping tax lines * fix: add migration for shipping taxes * fix: integration tests for shipping taxes * fix: integration tests for shipping taxes * fix: add integration tests for manual taxes * fix: cart service - cleanup jsdoc * feat: add /carts/id/taxes to manually calculate taxes * feat: add integration tests for order tax calculations * feat: adds cart completion strategy + create order w. tax lines * fix: unit tests * fix: merge * fix: rm verbose * fix: unit tests * fix: unit tests * fix: unit tests * fix: ensure calculation for list orders * fix: unit tests * fix: integration tests * fix: adds cart order type gaurds * Docs/tax api (#954) * feat: adds tax related db entities + tax provider * fix: add tax provider tests * fix: add tax service unit tests * fix: tests + migrations * feat: totals service to ts * fix: remove totals.js * fix: add shipping methods * fix: add inherited tax lines * chore: rm tax-line repo * fix: test * fix: tests * fix: tests * fix: unit test * fix: integration test helpers * fix: adds factories + tests automatic tax rates * fix: remove verbose * fix: adds TotalsServiceProps * fix: add shipping tax lines * fix: add migration for shipping taxes * fix: integration tests for shipping taxes * fix: integration tests for shipping taxes * fix: add integration tests for manual taxes * fix: cart service - cleanup jsdoc * feat: add /carts/id/taxes to manually calculate taxes * feat: add integration tests for order tax calculations * feat: adds cart completion strategy + create order w. tax lines * fix: unit tests * fix: merge * fix: rm verbose * fix: unit tests * fix: unit tests * fix: unit tests * fix: ensure calculation for list orders * fix: unit tests * fix: integration tests * docs: documents tax related methods and types * fix: require either item_id or shipping_method_id * feat: product type tax rate (#969) * feat: adds tax related db entities + tax provider * fix: add tax provider tests * fix: add tax service unit tests * fix: tests + migrations * feat: totals service to ts * fix: remove totals.js * fix: add shipping methods * fix: add inherited tax lines * chore: rm tax-line repo * fix: test * fix: tests * fix: tests * fix: unit test * fix: integration test helpers * fix: adds factories + tests automatic tax rates * fix: remove verbose * fix: adds TotalsServiceProps * fix: add shipping tax lines * fix: add migration for shipping taxes * fix: integration tests for shipping taxes * fix: integration tests for shipping taxes * fix: add integration tests for manual taxes * fix: cart service - cleanup jsdoc * feat: add /carts/id/taxes to manually calculate taxes * feat: add integration tests for order tax calculations * feat: adds cart completion strategy + create order w. tax lines * fix: unit tests * fix: merge * fix: rm verbose * fix: unit tests * fix: unit tests * fix: unit tests * fix: ensure calculation for list orders * fix: unit tests * fix: integration tests * docs: documents tax related methods and types * fix: require either item_id or shipping_method_id * feat: adds returns tests for new tax system * feat: adds return lines + integration tests for swaps * feat: return integration tests * feat: adds product type tax rates * feat: add tax management endpoints * fix: create single migration * fix: adds tax rates to js client * fix: strats * Fix/plugin tests (#998) * plugin testing setup * fix: test sendgrid plugin * fix: test sendgrid plugin * chore: clean * chore: clean * fix: clean up tests * fix: remove dirty import * fix: sendgrid + brightpearl * fix: plugin integration tests * fix: klarna * fix: shipping method tax * fix: remove taxrates * fix: unit tests * fix: integration * fix: integration * fix: plugins tests * fix: ignore plugins * fix: tests * fix: taxes (#1017) * fix: taxes * fix: taxes * fix: faulty ref * fix: create tax-lines with claim items * fix: snapshot tax-liens * fix: allows integration test teardown to force deleting tables * fix: tests * fix: merge * fix: adds tax-rates to client * fix: adds tax-rates to medusa-react * fix: tests * fix: tests * fix: add product types * fix: adds tax provider endpoint + cascaded deletes on tax rate relations * fix: move errors to service layer * fix: cleanup api * fix: unit tests * fix: error handler in base-service * fix: Add order region to swap on createFulfillment (#1110) Co-authored-by: Oliver Windall Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
committed by
olivermrbl
co-authored by
Oliver Windall Juhl
parent
d80eaa172d
commit
47588e7a8d
@@ -18,6 +18,7 @@
|
||||
"@babel/plugin-transform-runtime": "^7.7.6",
|
||||
"@babel/preset-env": "^7.7.5",
|
||||
"@babel/runtime": "^7.9.6",
|
||||
"@medusajs/medusa": "^1.1.62",
|
||||
"client-sessions": "^0.8.0",
|
||||
"cross-env": "^5.2.1",
|
||||
"eslint": "^6.8.0",
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
import { TotalsService } from "@medusajs/medusa"
|
||||
import { humanizeAmount } from "medusa-core-utils"
|
||||
import { FulfillmentService } from "medusa-interfaces"
|
||||
import Webshipper from "../utils/webshipper"
|
||||
|
||||
class WebshipperFulfillmentService extends FulfillmentService {
|
||||
static identifier = "webshipper"
|
||||
|
||||
constructor({ logger, claimService, swapService, orderService }, options) {
|
||||
constructor(
|
||||
{ logger, totalsService, claimService, swapService, orderService },
|
||||
options
|
||||
) {
|
||||
super()
|
||||
|
||||
this.options_ = options
|
||||
@@ -25,6 +30,9 @@ class WebshipperFulfillmentService extends FulfillmentService {
|
||||
/** @private @const {OrderService} */
|
||||
this.orderService_ = orderService
|
||||
|
||||
/** @private @const {TotalsService} */
|
||||
this.totalsService_ = totalsService
|
||||
|
||||
/** @private @const {SwapService} */
|
||||
this.swapService_ = swapService
|
||||
|
||||
@@ -170,22 +178,38 @@ class WebshipperFulfillmentService extends FulfillmentService {
|
||||
width: 15,
|
||||
length: 15,
|
||||
},
|
||||
customs_lines: returnOrder.items.map(({ item, quantity }) => {
|
||||
return {
|
||||
ext_ref: item.id,
|
||||
sku: item.variant.sku,
|
||||
description: item.title,
|
||||
quantity: quantity,
|
||||
country_of_origin:
|
||||
item.variant.origin_country ||
|
||||
item.variant.product.origin_country,
|
||||
tarif_number:
|
||||
item.variant.hs_code || item.variant.product.hs_code,
|
||||
unit_price: item.unit_price / 100,
|
||||
vat_percent: fromOrder.tax_rate,
|
||||
currency: fromOrder.currency_code.toUpperCase(),
|
||||
}
|
||||
}),
|
||||
customs_lines: await Promise.all(
|
||||
returnOrder.items.map(async ({ item, quantity }) => {
|
||||
const totals = await this.totalsService_.getLineItemTotals(
|
||||
item,
|
||||
fromOrder,
|
||||
{
|
||||
include_tax: true,
|
||||
use_tax_lines: true,
|
||||
}
|
||||
)
|
||||
return {
|
||||
ext_ref: item.id,
|
||||
sku: item.variant.sku,
|
||||
description: item.title,
|
||||
quantity: quantity,
|
||||
country_of_origin:
|
||||
item.variant.origin_country ||
|
||||
item.variant.product.origin_country,
|
||||
tarif_number:
|
||||
item.variant.hs_code || item.variant.product.hs_code,
|
||||
unit_price: humanizeAmount(
|
||||
totals.unit_price,
|
||||
fromOrder.currency_code
|
||||
),
|
||||
vat_percent: totals.tax_lines.reduce(
|
||||
(acc, next) => acc + next.rate,
|
||||
0
|
||||
),
|
||||
currency: fromOrder.currency_code.toUpperCase(),
|
||||
}
|
||||
})
|
||||
),
|
||||
},
|
||||
],
|
||||
sender_address: {
|
||||
@@ -329,21 +353,38 @@ class WebshipperFulfillmentService extends FulfillmentService {
|
||||
status: "pending",
|
||||
ext_ref,
|
||||
visible_ref,
|
||||
order_lines: fulfillmentItems.map((item) => {
|
||||
return {
|
||||
ext_ref: item.id,
|
||||
sku: item.variant.sku,
|
||||
description: item.title,
|
||||
quantity: item.quantity,
|
||||
country_of_origin:
|
||||
item.variant.origin_country ||
|
||||
item.variant.product.origin_country,
|
||||
tarif_number:
|
||||
item.variant.hs_code || item.variant.product.hs_code,
|
||||
unit_price: item.unit_price / 100,
|
||||
vat_percent: fromOrder.tax_rate,
|
||||
}
|
||||
}),
|
||||
order_lines: await Promise.all(
|
||||
fulfillmentItems.map(async (item) => {
|
||||
const totals = await this.totalsService_.getLineItemTotals(
|
||||
item,
|
||||
fromOrder,
|
||||
{
|
||||
include_tax: true,
|
||||
use_tax_lines: true,
|
||||
}
|
||||
)
|
||||
|
||||
return {
|
||||
ext_ref: item.id,
|
||||
sku: item.variant.sku,
|
||||
description: item.title,
|
||||
quantity: item.quantity,
|
||||
country_of_origin:
|
||||
item.variant.origin_country ||
|
||||
item.variant.product.origin_country,
|
||||
tarif_number:
|
||||
item.variant.hs_code || item.variant.product.hs_code,
|
||||
unit_price: humanizeAmount(
|
||||
totals.unit_price,
|
||||
fromOrder.currency_code
|
||||
),
|
||||
vat_percent: totals.tax_lines.reduce(
|
||||
(acc, next) => acc + next.rate,
|
||||
0
|
||||
),
|
||||
}
|
||||
})
|
||||
),
|
||||
delivery_address: {
|
||||
att_contact: `${shipping_address.first_name} ${shipping_address.last_name}`,
|
||||
address_1: shipping_address.address_1,
|
||||
|
||||
Reference in New Issue
Block a user