diff --git a/packages/medusa/src/migrations/1638543550000-order_tax_rate_to_real_type.ts b/packages/medusa/src/migrations/1638543550000-order_tax_rate_to_real_type.ts new file mode 100644 index 0000000000..67c1a7e060 --- /dev/null +++ b/packages/medusa/src/migrations/1638543550000-order_tax_rate_to_real_type.ts @@ -0,0 +1,23 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class orderTaxRateToRealType1638543550000 implements MigrationInterface { + name = "orderTaxRateToRealType1638543550000" + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "order" ALTER COLUMN "tax_rate" TYPE REAL` + ) + await queryRunner.query( + `ALTER TABLE "region" ALTER COLUMN "tax_rate" TYPE REAL` + ) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `ALTER TABLE "order" ALTER COLUMN "tax_rate" TYPE INTEGER` + ) + await queryRunner.query( + `ALTER TABLE "region" ALTER COLUMN "tax_rate" TYPE NUMERIC` + ) + } +} diff --git a/packages/medusa/src/models/order.ts b/packages/medusa/src/models/order.ts index c7cc86c3a5..85a5254f78 100644 --- a/packages/medusa/src/models/order.ts +++ b/packages/medusa/src/models/order.ts @@ -142,7 +142,7 @@ export class Order { @JoinColumn({ name: "currency_code", referencedColumnName: "code" }) currency: Currency - @Column({ type: "int" }) + @Column({ type: "real" }) tax_rate: number @ManyToMany(() => Discount, { cascade: ["insert"] }) @@ -173,29 +173,57 @@ export class Order { }) gift_cards: GiftCard[] - @OneToMany(() => ShippingMethod, (method) => method.order, { - cascade: ["insert"], - }) + @OneToMany( + () => ShippingMethod, + method => method.order, + { + cascade: ["insert"], + } + ) shipping_methods: ShippingMethod[] - @OneToMany(() => Payment, (payment) => payment.order, { cascade: ["insert"] }) + @OneToMany( + () => Payment, + payment => payment.order, + { cascade: ["insert"] } + ) payments: Payment[] - @OneToMany(() => Fulfillment, (fulfillment) => fulfillment.order, { - cascade: ["insert"], - }) + @OneToMany( + () => Fulfillment, + fulfillment => fulfillment.order, + { + cascade: ["insert"], + } + ) fulfillments: Fulfillment[] - @OneToMany(() => Return, (ret) => ret.order, { cascade: ["insert"] }) + @OneToMany( + () => Return, + ret => ret.order, + { cascade: ["insert"] } + ) returns: Return[] - @OneToMany(() => ClaimOrder, (co) => co.order, { cascade: ["insert"] }) + @OneToMany( + () => ClaimOrder, + co => co.order, + { cascade: ["insert"] } + ) claims: ClaimOrder[] - @OneToMany(() => Refund, (ref) => ref.order, { cascade: ["insert"] }) + @OneToMany( + () => Refund, + ref => ref.order, + { cascade: ["insert"] } + ) refunds: Refund[] - @OneToMany(() => Swap, (swap) => swap.order, { cascade: ["insert"] }) + @OneToMany( + () => Swap, + swap => swap.order, + { cascade: ["insert"] } + ) swaps: Swap[] @Column({ nullable: true }) @@ -205,12 +233,19 @@ export class Order { @JoinColumn({ name: "draft_order_id" }) draft_order: DraftOrder - @OneToMany(() => LineItem, (lineItem) => lineItem.order, { - cascade: ["insert"], - }) + @OneToMany( + () => LineItem, + lineItem => lineItem.order, + { + cascade: ["insert"], + } + ) items: LineItem[] - @OneToMany(() => GiftCardTransaction, (gc) => gc.order) + @OneToMany( + () => GiftCardTransaction, + gc => gc.order + ) gift_card_transactions: GiftCardTransaction[] @Column({ nullable: true, type: resolveDbType("timestamptz") }) @@ -304,7 +339,7 @@ export class Order { * currency_code: * type: string * tax_rate: - * type: integer + * type: number * discounts: * type: array * items: diff --git a/packages/medusa/src/models/region.ts b/packages/medusa/src/models/region.ts index 07e7d95ab1..d54df230b6 100644 --- a/packages/medusa/src/models/region.ts +++ b/packages/medusa/src/models/region.ts @@ -35,7 +35,7 @@ export class Region { @JoinColumn({ name: "currency_code", referencedColumnName: "code" }) currency: Currency - @Column({ type: "decimal" }) + @Column({ type: "real" }) tax_rate: number @Column({ nullable: true })