Merge branch 'medusajs:develop' into bug-german-language-corrections

.changeset/cold-dragons-lie.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/utils": patch
+---
+
+fix: do not rely on model loading order to find an implicit owner

.changeset/hip-suns-sort.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/types": patch
+"@medusajs/utils": patch
+---
+
+feature: add support for check constraints in DML

.changeset/kind-moons-attack.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/pricing": patch
+"@medusajs/types": patch
+---
+
+feat(pricing, types): add price rule operators to price calculations

.changeset/lazy-eagles-bow.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/auth": minor
+---
+
+feat(auth): Migrate auth module to DML

.changeset/nasty-tigers-cross.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): remove request body type argument from cancel order transfer routes

.changeset/purple-maps-bow.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/product": patch
+---
+
+fix(product): change export name of ProductImage

.changeset/rotten-tigers-worry.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/user": minor
+---
+
+feat(user): Migrate user module to DML

.changeset/spicy-beds-rescue.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/core-flows": patch
+"@medusajs/framework": patch
+"@medusajs/medusa": patch
+---
+
+feat(core-flows,framework,medusa): list shipping options pass in cart as pricing context

.changeset/strange-trainers-watch.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/ui-preset": patch
+"@medusajs/icons": patch
+---
+
+feat(ui,icons,ui-preset): Sync with latest changes from Figma, and fix Code components

.github/workflows/test-cli-with-database.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Create Medusa project
         run: |
-          medusa new cli-test --skip-db --v2 --branch feat/v2-ci
+          medusa new cli-test --skip-db --v2 --branch ci
         working-directory: ..
 
       - name: run medusa dev

.github/workflows/trigger-release.yml

@@ -1,6 +1,8 @@
 name: Trigger Release and Publish
 
 on:
+  release:
+    types: [published]
   workflow_dispatch:
     inputs:
       version:

integration-tests/http/CHANGELOG.md

@@ -1,5 +1,33 @@
 # integration-tests-http
 
+## 1.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`e9003c3124f284eae7e1457101bf10c1beccbac1`](https://github.com/medusajs/medusa/commit/e9003c3124f284eae7e1457101bf10c1beccbac1), [`030ee871506cfe178702853714feaaa33f1d9cf4`](https://github.com/medusajs/medusa/commit/030ee871506cfe178702853714feaaa33f1d9cf4)]:
+  - @medusajs/utils@2.0.7
+  - @medusajs/core-flows@2.0.7
+  - @medusajs/modules-sdk@2.0.7
+  - @medusajs/medusa@2.0.7
+  - @medusajs/test-utils@2.0.7
+  - @medusajs/api-key@2.0.7
+  - @medusajs/auth@2.0.7
+  - @medusajs/cache-inmemory@2.0.7
+  - @medusajs/customer@2.0.7
+  - @medusajs/event-bus-local@2.0.7
+  - @medusajs/fulfillment@2.0.7
+  - @medusajs/inventory@2.0.7
+  - @medusajs/pricing@2.0.7
+  - @medusajs/product@2.0.7
+  - @medusajs/promotion@2.0.7
+  - @medusajs/fulfillment-manual@2.0.7
+  - @medusajs/region@2.0.7
+  - @medusajs/stock-location@2.0.7
+  - @medusajs/store@2.0.7
+  - @medusajs/tax@2.0.7
+  - @medusajs/user@2.0.7
+  - @medusajs/workflow-engine-inmemory@2.0.7
+
 ## 1.0.3
 
 ### Patch Changes

integration-tests/http/__tests__/cart/store/cart.spec.ts

@@ -362,6 +362,91 @@ medusaIntegrationTestRunner({
           )
         })
 
+        it("should add item to cart with tax lines multiple times", async () => {
+          let response = await api.post(
+            `/store/carts/${cart.id}/line-items`,
+            {
+              variant_id: product.variants[0].id,
+              quantity: 1,
+            },
+            storeHeaders
+          )
+
+          expect(response.status).toEqual(200)
+          expect(response.data.cart).toEqual(
+            expect.objectContaining({
+              id: cart.id,
+              currency_code: "usd",
+              items: expect.arrayContaining([
+                expect.objectContaining({
+                  unit_price: 1500,
+                  compare_at_unit_price: null,
+                  is_tax_inclusive: true,
+                  title: "S / Black",
+                  quantity: 2,
+                  tax_lines: [
+                    expect.objectContaining({
+                      description: "CA Default Rate",
+                      code: "CADEFAULT",
+                      rate: 5,
+                      provider_id: "system",
+                    }),
+                  ],
+                }),
+              ]),
+            })
+          )
+
+          response = await api.post(
+            `/store/carts/${cart.id}/line-items`,
+            {
+              variant_id: product.variants[1].id,
+              quantity: 1,
+            },
+            storeHeaders
+          )
+
+          expect(response.status).toEqual(200)
+          expect(response.data.cart).toEqual(
+            expect.objectContaining({
+              id: cart.id,
+              currency_code: "usd",
+              items: expect.arrayContaining([
+                expect.objectContaining({
+                  unit_price: 1500,
+                  compare_at_unit_price: null,
+                  is_tax_inclusive: true,
+                  quantity: 2,
+                  title: "S / Black",
+                  tax_lines: [
+                    expect.objectContaining({
+                      description: "CA Default Rate",
+                      code: "CADEFAULT",
+                      rate: 5,
+                      provider_id: "system",
+                    }),
+                  ],
+                }),
+                expect.objectContaining({
+                  unit_price: 1500,
+                  compare_at_unit_price: null,
+                  is_tax_inclusive: true,
+                  quantity: 1,
+                  title: "S / White",
+                  tax_lines: [
+                    expect.objectContaining({
+                      description: "CA Default Rate",
+                      code: "CADEFAULT",
+                      rate: 5,
+                      provider_id: "system",
+                    }),
+                  ],
+                }),
+              ]),
+            })
+          )
+        })
+
         describe("with sale price lists", () => {
           let priceList
 

integration-tests/http/__tests__/invite/admin/invite.spec.ts

@@ -156,6 +156,37 @@ medusaIntegrationTestRunner({
             expect(e.response.data.message).toEqual("Unauthorized")
           })
       })
+
+      it("should fail to accept with an expired token", async () => {
+        jest.useFakeTimers()
+
+        const signup = await api.post("/auth/user/emailpass/register", {
+          email: "test@medusa-commerce.com",
+          password: "secret_password",
+        })
+
+        // Advance time by 25 hours
+        jest.advanceTimersByTime(25 * 60 * 60 * 1000)
+
+        await api
+          .post(
+            `/admin/invites/accept?token=${invite.token}`,
+            {
+              first_name: "Another Test",
+              last_name: "User",
+            },
+            {
+              headers: { authorization: `Bearer ${signup.data.token}` },
+            }
+          )
+          .catch((e) => {
+            expect(e.response.status).toEqual(401)
+            expect(e.response.data.message).toEqual("Unauthorized")
+          })
+
+        jest.useRealTimers()
+      })
+
       it("should resend an invite", async () => {
         const resendResponse = (
           await api.post(`/admin/invites/${invite.id}/resend`, {}, adminHeaders)