Skip to content

Commit

Permalink
Merge branch 'develop' into docs/fulfillment-provider-calculate-so
Browse files Browse the repository at this point in the history
  • Loading branch information
shahednasser committed Dec 13, 2024
2 parents bf93a88 + 0380328 commit 07b8ecf
Show file tree
Hide file tree
Showing 32 changed files with 710 additions and 526 deletions.
5 changes: 5 additions & 0 deletions .changeset/unlucky-radios-fry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/tax": patch
---

Feat/tax dml
4 changes: 4 additions & 0 deletions .github/workflows/docs-freshness-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ jobs:
run: yarn install
working-directory: www/utils

- name: Build Workspace packages
run: yarn build
working-directory: www/utils

- name: Perform Freshness Check
run: yarn check:freshness
working-directory: www/utils/packages/scripts
2 changes: 2 additions & 0 deletions packages/core/utils/src/dml/entity-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ export class EntityBuilder {
/**
* This method defines a float property that allows for
* values with decimal places
*
* @version 2.1.2
*
* @example
* import { model } from "@medusajs/framework/utils"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ITaxModuleService } from "@medusajs/framework/types"
import { Module, Modules } from "@medusajs/framework/utils"
import { Module, Modules, toMikroORMEntity } from "@medusajs/framework/utils"
import { TaxModuleService } from "@services"
import { moduleIntegrationTestRunner } from "@medusajs/test-utils"
import { setupTaxStructure } from "../utils/setup-tax-structure"
Expand All @@ -11,7 +11,7 @@ moduleIntegrationTestRunner<ITaxModuleService>({
testSuite: ({ service }) => {
describe("TaxModuleService", function () {
it(`should export the appropriate linkable configuration`, () => {
const linkable = Module(Modules.TAX, {
const linkable = Module(toMikroORMEntity(Modules.TAX), {
service: TaxModuleService,
}).linkable

Expand Down
Loading

0 comments on commit 07b8ecf

Please sign in to comment.