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

fix: Product type tax overrides (#9951)

Browse Source 
* fix: Make product type tax override work

* fix: Make product type tax override work
This commit is contained in:
Oli Juhl authored and GitHub committed 2024-11-06 20:33:40 +01:00
1 parent aa78fbf546
commit 505768dd9f
35 files changed
+479 -309
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/modules/cart/integration-tests/__tests__/services/cart-module/index.spec.ts
+3 -1
View File
@@ -1,8 +1,8 @@
import { ICartModuleService } from "@medusajs/framework/types"
import { BigNumber, Module, Modules } from "@medusajs/framework/utils"
import { moduleIntegrationTestRunner } from "@medusajs/test-utils"
import { CheckConstraintViolationException } from "@mikro-orm/core"
import { CartModuleService } from "@services"
import { moduleIntegrationTestRunner } from "@medusajs/test-utils"
jest.setTimeout(50000)
@@ -2502,6 +2502,7 @@ moduleIntegrationTestRunner<ICartModuleService>({
product_description: null,
product_subtitle: null,
product_type: null,
product_type_id: null,
product_collection: null,
product_handle: null,
variant_sku: null,
@@ -2606,6 +2607,7 @@ moduleIntegrationTestRunner<ICartModuleService>({
product_description: null,
product_subtitle: null,
product_type: null,
product_type_id: null,
product_collection: null,
product_handle: null,
variant_sku: null,
packages/modules/cart/package.json
+1
View File
@@ -37,6 +37,7 @@
"orm:cache:clear": " MIKRO_ORM_CLI=./mikro-orm.config.dev.ts medusa-mikro-orm cache:clear"
},
"devDependencies": {
"@medusajs/framework": "^2.0.1",
"@medusajs/test-utils": "^2.0.1",
"@mikro-orm/cli": "5.9.7",
"@mikro-orm/core": "5.9.7",
packages/modules/cart/src/migrations/.snapshot-medusa-cart.json
+235 -82
View File
@@ -1,5 +1,7 @@
{
"namespaces": ["public"],
"namespaces": [
"public"
],
"name": "public",
"tables": [
{
@@ -159,7 +161,9 @@
"indexes": [
{
"keyName": "IDX_cart_address_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -167,7 +171,9 @@
},
{
"keyName": "cart_address_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
@@ -259,6 +265,16 @@
"nullable": true,
"mappedType": "json"
},
"completed_at": {
"name": "completed_at",
"type": "timestamptz",
"unsigned": false,
"autoincrement": false,
"primary": false,
"nullable": true,
"length": 6,
"mappedType": "datetime"
},
"created_at": {
"name": "created_at",
"type": "timestamptz",
@@ -295,30 +311,11 @@
"name": "cart",
"schema": "public",
"indexes": [
{
"columnNames": ["sales_channel_id"],
"composite": false,
"keyName": "IDX_cart_sales_channel_id",
"primary": false,
"unique": false
},
{
"columnNames": ["currency_code"],
"composite": false,
"keyName": "IDX_cart_curency_code",
"primary": false,
"unique": false
},
{
"columnNames": ["billing_address_id"],
"composite": false,
"keyName": "IDX_cart_billing_address_id",
"primary": false,
"unique": false
},
{
"keyName": "IDX_cart_region_id",
"columnNames": ["region_id"],
"columnNames": [
"region_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -326,7 +323,9 @@
},
{
"keyName": "IDX_cart_customer_id",
"columnNames": ["customer_id"],
"columnNames": [
"customer_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -334,15 +333,29 @@
},
{
"keyName": "IDX_cart_sales_channel_id",
"columnNames": ["sales_channel_id"],
"columnNames": [
"sales_channel_id"
],
"composite": false,
"primary": false,
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_cart_sales_channel_id\" ON \"cart\" (sales_channel_id) WHERE deleted_at IS NULL AND sales_channel_id IS NOT NULL"
},
{
"keyName": "IDX_cart_curency_code",
"columnNames": [
"currency_code"
],
"composite": false,
"primary": false,
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_cart_curency_code\" ON \"cart\" (currency_code) WHERE deleted_at IS NULL"
},
{
"keyName": "IDX_cart_shipping_address_id",
"columnNames": ["shipping_address_id"],
"columnNames": [
"shipping_address_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -350,7 +363,9 @@
},
{
"keyName": "IDX_cart_billing_address_id",
"columnNames": ["billing_address_id"],
"columnNames": [
"billing_address_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -358,7 +373,9 @@
},
{
"keyName": "IDX_cart_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -366,7 +383,9 @@
},
{
"keyName": "cart_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
@@ -376,18 +395,26 @@
"foreignKeys": {
"cart_shipping_address_id_foreign": {
"constraintName": "cart_shipping_address_id_foreign",
"columnNames": ["shipping_address_id"],
"columnNames": [
"shipping_address_id"
],
"localTableName": "public.cart",
"referencedColumnNames": ["id"],
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart_address",
"deleteRule": "set null",
"updateRule": "cascade"
},
"cart_billing_address_id_foreign": {
"constraintName": "cart_billing_address_id_foreign",
"columnNames": ["billing_address_id"],
"columnNames": [
"billing_address_id"
],
"localTableName": "public.cart",
"referencedColumnNames": ["id"],
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart_address",
"deleteRule": "set null",
"updateRule": "cascade"
@@ -504,6 +531,15 @@
"nullable": true,
"mappedType": "text"
},
"product_type_id": {
"name": "product_type_id",
"type": "text",
"unsigned": false,
"autoincrement": false,
"primary": false,
"nullable": true,
"mappedType": "text"
},
"product_collection": {
"name": "product_collection",
"type": "text",
@@ -565,7 +601,6 @@
"autoincrement": false,
"primary": false,
"nullable": false,
"default": "true",
"mappedType": "boolean"
},
"is_discountable": {
@@ -575,7 +610,6 @@
"autoincrement": false,
"primary": false,
"nullable": false,
"default": "true",
"mappedType": "boolean"
},
"is_tax_inclusive": {
@@ -585,7 +619,6 @@
"autoincrement": false,
"primary": false,
"nullable": false,
"default": "false",
"mappedType": "boolean"
},
"compare_at_unit_price": {
@@ -671,7 +704,9 @@
"indexes": [
{
"keyName": "IDX_line_item_cart_id",
"columnNames": ["cart_id"],
"columnNames": [
"cart_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -679,7 +714,9 @@
},
{
"keyName": "IDX_line_item_variant_id",
"columnNames": ["variant_id"],
"columnNames": [
"variant_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -687,15 +724,29 @@
},
{
"keyName": "IDX_line_item_product_id",
"columnNames": ["product_id"],
"columnNames": [
"product_id"
],
"composite": false,
"primary": false,
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_line_item_product_id\" ON \"cart_line_item\" (product_id) WHERE deleted_at IS NULL AND product_id IS NOT NULL"
},
{
"keyName": "IDX_line_item_product_type_id",
"columnNames": [
"product_type_id"
],
"composite": false,
"primary": false,
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_line_item_product_type_id\" ON \"cart_line_item\" (product_type_id) WHERE deleted_at IS NULL AND product_type_id IS NOT NULL"
},
{
"keyName": "IDX_cart_line_item_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -703,7 +754,9 @@
},
{
"keyName": "cart_line_item_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
@@ -713,9 +766,13 @@
"foreignKeys": {
"cart_line_item_cart_id_foreign": {
"constraintName": "cart_line_item_cart_id_foreign",
"columnNames": ["cart_id"],
"columnNames": [
"cart_id"
],
"localTableName": "public.cart_line_item",
"referencedColumnNames": ["id"],
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart",
"updateRule": "cascade"
}
@@ -842,7 +899,9 @@
"indexes": [
{
"keyName": "IDX_adjustment_item_id",
"columnNames": ["item_id"],
"columnNames": [
"item_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -850,15 +909,19 @@
},
{
"keyName": "IDX_line_item_adjustment_promotion_id",
"columnNames": ["promotion_id"],
"columnNames": [
"promotion_id"
],
"composite": false,
"primary": false,
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_line_item_adjustment_promotion_id\" ON \"cart_line_item_adjustment\" (promotion_id) WHERE deleted_at IS NULL and promotion_id IS NOT NULL"
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_line_item_adjustment_promotion_id\" ON \"cart_line_item_adjustment\" (promotion_id) WHERE deleted_at IS NULL AND promotion_id IS NOT NULL"
},
{
"keyName": "IDX_cart_line_item_adjustment_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -866,7 +929,9 @@
},
{
"keyName": "cart_line_item_adjustment_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
@@ -879,7 +944,20 @@
"definition": "check ((amount >= 0))"
}
],
"foreignKeys": {}
"foreignKeys": {
"cart_line_item_adjustment_item_id_foreign": {
"constraintName": "cart_line_item_adjustment_item_id_foreign",
"columnNames": [
"item_id"
],
"localTableName": "public.cart_line_item_adjustment",
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart_line_item",
"updateRule": "cascade"
}
}
},
{
"columns": {
@@ -993,7 +1071,9 @@
"indexes": [
{
"keyName": "IDX_tax_line_item_id",
"columnNames": ["item_id"],
"columnNames": [
"item_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1001,7 +1081,9 @@
},
{
"keyName": "IDX_line_item_tax_line_tax_rate_id",
"columnNames": ["tax_rate_id"],
"columnNames": [
"tax_rate_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1009,7 +1091,9 @@
},
{
"keyName": "IDX_cart_line_item_tax_line_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1017,14 +1101,29 @@
},
{
"keyName": "cart_line_item_tax_line_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
}
],
"checks": [],
"foreignKeys": {}
"foreignKeys": {
"cart_line_item_tax_line_item_id_foreign": {
"constraintName": "cart_line_item_tax_line_item_id_foreign",
"columnNames": [
"item_id"
],
"localTableName": "public.cart_line_item_tax_line",
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart_line_item",
"updateRule": "cascade"
}
}
},
{
"columns": {
@@ -1157,7 +1256,9 @@
"indexes": [
{
"keyName": "IDX_shipping_method_cart_id",
"columnNames": ["cart_id"],
"columnNames": [
"cart_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1165,7 +1266,9 @@
},
{
"keyName": "IDX_shipping_method_option_id",
"columnNames": ["shipping_option_id"],
"columnNames": [
"shipping_option_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1173,7 +1276,9 @@
},
{
"keyName": "IDX_cart_shipping_method_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1181,7 +1286,9 @@
},
{
"keyName": "cart_shipping_method_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
@@ -1197,9 +1304,13 @@
"foreignKeys": {
"cart_shipping_method_cart_id_foreign": {
"constraintName": "cart_shipping_method_cart_id_foreign",
"columnNames": ["cart_id"],
"columnNames": [
"cart_id"
],
"localTableName": "public.cart_shipping_method",
"referencedColumnNames": ["id"],
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart",
"updateRule": "cascade"
}
@@ -1261,6 +1372,15 @@
"nullable": true,
"mappedType": "text"
},
"metadata": {
"name": "metadata",
"type": "jsonb",
"unsigned": false,
"autoincrement": false,
"primary": false,
"nullable": true,
"mappedType": "json"
},
"created_at": {
"name": "created_at",
"type": "timestamptz",
@@ -1292,15 +1412,6 @@
"nullable": false,
"mappedType": "text"
},
"metadata": {
"name": "metadata",
"type": "jsonb",
"unsigned": false,
"autoincrement": false,
"primary": false,
"nullable": true,
"mappedType": "json"
},
"promotion_id": {
"name": "promotion_id",
"type": "text",
@@ -1326,7 +1437,9 @@
"indexes": [
{
"keyName": "IDX_adjustment_shipping_method_id",
"columnNames": ["shipping_method_id"],
"columnNames": [
"shipping_method_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1334,15 +1447,19 @@
},
{
"keyName": "IDX_shipping_method_adjustment_promotion_id",
"columnNames": ["promotion_id"],
"columnNames": [
"promotion_id"
],
"composite": false,
"primary": false,
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_shipping_method_adjustment_promotion_id\" ON \"cart_shipping_method_adjustment\" (promotion_id) WHERE deleted_at IS NULL and promotion_id IS NOT NULL"
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_shipping_method_adjustment_promotion_id\" ON \"cart_shipping_method_adjustment\" (promotion_id) WHERE deleted_at IS NULL AND promotion_id IS NOT NULL"
},
{
"keyName": "IDX_cart_shipping_method_adjustment_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1350,14 +1467,29 @@
},
{
"keyName": "cart_shipping_method_adjustment_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
}
],
"checks": [],
"foreignKeys": {}
"foreignKeys": {
"cart_shipping_method_adjustment_shipping_method_id_foreign": {
"constraintName": "cart_shipping_method_adjustment_shipping_method_id_foreign",
"columnNames": [
"shipping_method_id"
],
"localTableName": "public.cart_shipping_method_adjustment",
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart_shipping_method",
"updateRule": "cascade"
}
}
},
{
"columns": {
@@ -1471,7 +1603,9 @@
"indexes": [
{
"keyName": "IDX_tax_line_shipping_method_id",
"columnNames": ["shipping_method_id"],
"columnNames": [
"shipping_method_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1479,7 +1613,9 @@
},
{
"keyName": "IDX_shipping_method_tax_line_tax_rate_id",
"columnNames": ["tax_rate_id"],
"columnNames": [
"tax_rate_id"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1487,7 +1623,9 @@
},
{
"keyName": "IDX_cart_shipping_method_tax_line_deleted_at",
"columnNames": ["deleted_at"],
"columnNames": [
"deleted_at"
],
"composite": false,
"primary": false,
"unique": false,
@@ -1495,14 +1633,29 @@
},
{
"keyName": "cart_shipping_method_tax_line_pkey",
"columnNames": ["id"],
"columnNames": [
"id"
],
"composite": false,
"primary": true,
"unique": true
}
],
"checks": [],
"foreignKeys": {}
"foreignKeys": {
"cart_shipping_method_tax_line_shipping_method_id_foreign": {
"constraintName": "cart_shipping_method_tax_line_shipping_method_id_foreign",
"columnNames": [
"shipping_method_id"
],
"localTableName": "public.cart_shipping_method_tax_line",
"referencedColumnNames": [
"id"
],
"referencedTableName": "public.cart_shipping_method",
"updateRule": "cascade"
}
}
}
]
}
packages/modules/cart/src/migrations/Migration20241106085918.ts
+15
View File
@@ -0,0 +1,15 @@
import { Migration } from '@mikro-orm/migrations';
export class Migration20241106085918 extends Migration {
async up(): Promise<void> {
this.addSql('alter table if exists "cart_line_item" add column if not exists "product_type_id" text null;');
this.addSql('CREATE INDEX IF NOT EXISTS "IDX_line_item_product_type_id" ON "cart_line_item" (product_type_id) WHERE deleted_at IS NULL AND product_type_id IS NOT NULL;');
}
async down(): Promise<void> {
this.addSql('drop index if exists "IDX_line_item_product_type_id";');
this.addSql('alter table if exists "cart_line_item" drop column if exists "product_type_id";');
}
}
packages/modules/cart/src/models/line-item.ts
+11
View File
@@ -53,6 +53,13 @@ const ProductIdIndex = createPsqlIndexStatementHelper({
where: "deleted_at IS NULL AND product_id IS NOT NULL",
}).MikroORMIndex
const ProductTypeIdIndex = createPsqlIndexStatementHelper({
name: "IDX_line_item_product_type_id",
tableName: "cart_line_item",
columns: "product_type_id",
where: "deleted_at IS NULL AND product_type_id IS NOT NULL",
}).MikroORMIndex
const DeletedAtIndex = createPsqlIndexStatementHelper({
tableName: "cart_line_item",
columns: "deleted_at",
@@ -111,6 +118,10 @@ export default class LineItem {
@Property({ columnType: "text", nullable: true })
product_type: string | null = null
@ProductTypeIdIndex()
@Property({ columnType: "text", nullable: true })
product_type_id: string | null = null
@Property({ columnType: "text", nullable: true })
product_collection: string | null = null
packages/modules/order/integration-tests/__tests__/create-order.ts
+1
View File
@@ -21,6 +21,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
product_description: "Description 1",
product_subtitle: "Product Subtitle 1",
product_type: "Type 1",
product_type_id: "type_1",
product_collection: "Collection 1",
product_handle: "handle1",
variant_id: "variant1",
packages/modules/order/integration-tests/__tests__/order-claim.ts
+1
View File
@@ -21,6 +21,7 @@ moduleIntegrationTestRunner({
product_description: "Description 1",
product_subtitle: "Product Subtitle 1",
product_type: "Type 1",
product_type_id: "type_1",
product_collection: "Collection 1",
product_handle: "handle1",
variant_id: "variant1",
packages/modules/order/integration-tests/__tests__/order-edit.ts
+2
View File
@@ -27,6 +27,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
product_description: "Description 1",
product_subtitle: "Product Subtitle 1",
product_type: "Type 1",
product_type_id: "type_1",
product_collection: "Collection 1",
product_handle: "handle1",
variant_id: "variant1",
@@ -284,6 +285,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
product_description: "Description 1",
product_subtitle: "Product Subtitle 1",
product_type: "Type 1",
product_type_id: "type_1",
product_collection: "Collection 1",
product_handle: "handle1",
variant_sku: "SKU1",
packages/modules/order/integration-tests/__tests__/order-exchange.ts
+1
View File
@@ -21,6 +21,7 @@ moduleIntegrationTestRunner({
product_description: "Description 1",
product_subtitle: "Product Subtitle 1",
product_type: "Type 1",
product_type_id: "type_1",
product_collection: "Collection 1",
product_handle: "handle1",
variant_id: "variant1",
packages/modules/order/integration-tests/__tests__/order-return.ts
+1
View File
@@ -21,6 +21,7 @@ moduleIntegrationTestRunner<IOrderModuleService>({
product_description: "Description 1",
product_subtitle: "Product Subtitle 1",
product_type: "Type 1",
product_type_id: "type_1",
product_collection: "Collection 1",
product_handle: "handle1",
variant_id: "variant1",
packages/modules/order/src/migrations/.snapshot-medusa-order.json
+19
View File
@@ -579,6 +579,15 @@
"nullable": true,
"mappedType": "text"
},
"product_type_id": {
"name": "product_type_id",
"type": "text",
"unsigned": false,
"autoincrement": false,
"primary": false,
"nullable": true,
"mappedType": "text"
},
"product_collection": {
"name": "product_collection",
"type": "text",
@@ -771,6 +780,16 @@
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_order_line_item_product_id\" ON \"order_line_item\" (product_id) WHERE deleted_at IS NOT NULL"
},
{
"keyName": "IDX_line_item_product_type_id",
"columnNames": [
"product_type_id"
],
"composite": false,
"primary": false,
"unique": false,
"expression": "CREATE INDEX IF NOT EXISTS \"IDX_line_item_product_type_id\" ON \"order_line_item\" (product_type_id) WHERE deleted_at IS NOT NULL AND product_type_id IS NOT NULL"
},
{
"keyName": "IDX_order_line_item_deleted_at",
"columnNames": [
packages/modules/order/src/migrations/Migration20241106085223.ts
+15
View File
@@ -0,0 +1,15 @@
import { Migration } from '@mikro-orm/migrations';
export class Migration20241106085223 extends Migration {
async up(): Promise<void> {
this.addSql('alter table if exists "order_line_item" add column if not exists "product_type_id" text null;');
this.addSql('CREATE INDEX IF NOT EXISTS "IDX_line_item_product_type_id" ON "order_line_item" (product_type_id) WHERE deleted_at IS NOT NULL AND product_type_id IS NOT NULL;');
}
async down(): Promise<void> {
this.addSql('drop index if exists "IDX_line_item_product_type_id";');
this.addSql('alter table if exists "order_line_item" drop column if exists "product_type_id";');
}
}
packages/modules/order/src/models/line-item.ts
+11
View File
@@ -36,6 +36,13 @@ const ProductIdIndex = createPsqlIndexStatementHelper({
where: "deleted_at IS NOT NULL",
})
const ProductTypeIdIndex = createPsqlIndexStatementHelper({
name: "IDX_line_item_product_type_id",
tableName: "order_line_item",
columns: "product_type_id",
where: "deleted_at IS NOT NULL AND product_type_id IS NOT NULL",
}).MikroORMIndex
const VariantIdIndex = createPsqlIndexStatementHelper({
tableName: "order_line_item",
columns: "variant_id",
@@ -85,6 +92,10 @@ export default class OrderLineItem {
@Property({ columnType: "text", nullable: true })
product_type: string | null = null
@ProductTypeIdIndex()
@Property({ columnType: "text", nullable: true })
product_type_id: string | null = null
@Property({ columnType: "text", nullable: true })
product_collection: string | null = null
packages/modules/order/src/schema/index.ts
+1
View File
@@ -161,6 +161,7 @@ type OrderLineItem {
product_description: String
product_subtitle: String
product_type: String
product_type_id: String
product_collection: String
product_handle: String
variant_sku: String
packages/modules/tax/src/services/tax-module-service.ts
+5 -4
View File
@@ -405,7 +405,7 @@ export default class TaxModuleService
const toReturn = await promiseAll(
items.map(async (item) => {
const regionIds = regions.map((r) => r.id)
const rateQuery = this.geTaxRateQueryForItem(item, regionIds)
const rateQuery = this.getTaxRateQueryForItem(item, regionIds)
const candidateRates = await this.taxRateService_.list(
rateQuery,
{
@@ -414,7 +414,7 @@ export default class TaxModuleService
sharedContext
)
const applicableRates = await this.geTaxRatesForItem(
const applicableRates = await this.getTaxRatesForItem(
item,
candidateRates
)
@@ -566,7 +566,7 @@ export default class TaxModuleService
}
}
private async geTaxRatesForItem(
private async getTaxRatesForItem(
item: TaxTypes.TaxableItemDTO | TaxTypes.TaxableShippingDTO,
rates: TaxRate[]
): Promise<TaxRate[]> {
@@ -598,7 +598,7 @@ export default class TaxModuleService
return ratesToReturn
}
private geTaxRateQueryForItem(
private getTaxRateQueryForItem(
item: TaxTypes.TaxableItemDTO | TaxTypes.TaxableShippingDTO,
regionIds: string[]
) {
@@ -698,6 +698,7 @@ export default class TaxModuleService
} else if (isDefault && !isProvince) {
decoratedRate.priority_score = 6
}
return decoratedRate
}) as (TaxRate & {
priority_score: number