Merge branch 'develop' into fix/stripe-payment-capture

silenaker · Jul 13, 2024 · 788d01d · 788d01d
2 parents 90435fb + 7e82f98
commit 788d01d
Show file tree

Hide file tree

Showing 282 changed files with 97,572 additions and 64,588 deletions.
diff --git a/.github/workflows/generate-public-references.yml b/.github/workflows/generate-public-references.yml
@@ -56,7 +56,9 @@ jobs:
           base: "develop"
           title: "chore(docs): Updated API Reference (v2)"
           labels: "type: chore"
-          add-paths: www/apps/api-reference/specs
+          add-paths: |
+            www/apps/api-reference/specs
+            www/utils/generated/oas-output
           branch: "docs/generate-api-ref"
           branch-suffix: "timestamp"
   ui:

diff --git a/.github/workflows/generate-resources-reference.yml b/.github/workflows/generate-resources-reference.yml
@@ -92,6 +92,7 @@ jobs:
           add-paths: |
             www/apps/resources/references/**
             www/apps/resources/generated/**
+            www/utils/generated/typedoc-json-output
           branch: "docs/generate-reference"
           branch-suffix: "timestamp"
           body: ${{ steps.pr-message.outputs.body }}
diff --git a/integration-tests/environment-helpers/use-db.js b/integration-tests/environment-helpers/use-db.js
@@ -11,7 +11,9 @@ const { dropDatabase } = require("pg-god")
 const { DataSource } = require("typeorm")
 const dbFactory = require("./use-template-db")
 const { ContainerRegistrationKeys } = require("@medusajs/utils")
-const { migrateMedusaApp } = require("@medusajs/medusa/dist/loaders/medusa-app")
+const {
+  runMedusaAppMigrations,
+} = require("@medusajs/medusa/dist/loaders/medusa-app")
 
 const DB_HOST = process.env.DB_HOST
 const DB_USERNAME = process.env.DB_USERNAME
@@ -181,10 +183,7 @@ module.exports = {
 
       instance.setPgConnection(pgConnection)
 
-      await migrateMedusaApp(
-        { configModule, container },
-        { registerInContainer: false }
-      )
+      await runMedusaAppMigrations({ configModule, container })
     }
 
     return dbDataSource

diff --git a/integration-tests/http/__tests__/product/store/product.spec.ts b/integration-tests/http/__tests__/product/store/product.spec.ts
@@ -921,9 +921,17 @@ medusaIntegrationTestRunner({
                   is_calculated_price_price_list: false,
                   is_calculated_price_tax_inclusive: false,
                   calculated_amount: 3000,
+                  raw_calculated_amount: {
+                    value: "3000",
+                    precision: 20,
+                  },
                   is_original_price_price_list: false,
                   is_original_price_tax_inclusive: false,
                   original_amount: 3000,
+                  raw_original_amount: {
+                    value: "3000",
+                    precision: 20,
+                  },
                   currency_code: "usd",
                   calculated_price: {
                     id: expect.any(String),
@@ -1227,9 +1235,17 @@ medusaIntegrationTestRunner({
                 is_calculated_price_price_list: false,
                 is_calculated_price_tax_inclusive: false,
                 calculated_amount: 3000,
+                raw_calculated_amount: {
+                  value: "3000",
+                  precision: 20,
+                },
                 is_original_price_price_list: false,
                 is_original_price_tax_inclusive: false,
                 original_amount: 3000,
+                raw_original_amount: {
+                  value: "3000",
+                  precision: 20,
+                },
                 currency_code: "usd",
                 calculated_price: {
                   id: expect.any(String),

diff --git a/integration-tests/modules/__tests__/order/order.spec.ts b/integration-tests/modules/__tests__/order/order.spec.ts
@@ -60,7 +60,7 @@ medusaIntegrationTestRunner({
     describe("Orders - Admin", () => {
       it("should get an order", async () => {
         const created = await orderModule.createOrders({
-          region_id: "test_region_idclear",
+          region_id: "test_region_id",
           email: "[email protected]",
           items: [
             {

diff --git a/integration-tests/modules/__tests__/order/workflows/__fixtures__/index.ts b/integration-tests/modules/__tests__/order/workflows/__fixtures__/index.ts
@@ -205,7 +205,7 @@ export async function createOrderFixture({
   )
 
   let order = await orderService.createOrders({
-    region_id: "test_region_idclear",
+    region_id: "test_region_id",
     email: "[email protected]",
     items: [
       {