Merge branch 'develop' into chore/to-remote-joiner-query

medusajs · Sep 10, 2023 · 821c4e5 · 821c4e5
2 parents 274b6b4 + 7a12aa0
commit 821c4e5
Show file tree

Hide file tree

Showing 148 changed files with 3,121 additions and 811 deletions.
diff --git a/.changeset/bright-apples-prove.md b/.changeset/bright-apples-prove.md
diff --git a/.changeset/brown-lions-cross.md b/.changeset/brown-lions-cross.md
diff --git a/.changeset/cool-pears-trade.md b/.changeset/cool-pears-trade.md
diff --git a/.changeset/friendly-months-attack.md b/.changeset/friendly-months-attack.md
diff --git a/.changeset/gorgeous-bugs-reply.md b/.changeset/gorgeous-bugs-reply.md
diff --git a/.changeset/great-months-train.md b/.changeset/great-months-train.md
diff --git a/.changeset/hot-tools-breathe.md b/.changeset/hot-tools-breathe.md
diff --git a/.changeset/itchy-worms-press.md b/.changeset/itchy-worms-press.md
diff --git a/.changeset/nine-glasses-allow.md b/.changeset/nine-glasses-allow.md
diff --git a/.changeset/odd-coats-learn.md b/.changeset/odd-coats-learn.md
diff --git a/.changeset/olive-years-heal.md b/.changeset/olive-years-heal.md
diff --git a/.changeset/poor-ants-deliver.md b/.changeset/poor-ants-deliver.md
diff --git a/.changeset/selfish-needles-beg.md b/.changeset/selfish-needles-beg.md
diff --git a/.changeset/selfish-trees-sip.md b/.changeset/selfish-trees-sip.md
diff --git a/.changeset/stale-games-marry.md b/.changeset/stale-games-marry.md
diff --git a/.changeset/strange-wombats-invite.md b/.changeset/strange-wombats-invite.md
diff --git a/.changeset/tough-baboons-shop.md b/.changeset/tough-baboons-shop.md
diff --git a/.changeset/warm-bikes-enjoy.md b/.changeset/warm-bikes-enjoy.md
diff --git a/.changeset/warm-worms-wave.md b/.changeset/warm-worms-wave.md
diff --git a/.changeset/young-teachers-sit.md b/.changeset/young-teachers-sit.md
diff --git a/integration-tests/api/__tests__/store/cart/cart.js b/integration-tests/api/__tests__/store/cart/cart.js
@@ -556,6 +556,7 @@ describe("/store/carts", () => {
               {
                 id: "test-li",
                 variant_id: "test-variant",
+                product_id: "test-product",
                 quantity: 1,
                 unit_price: 100,
                 adjustments: [
@@ -644,6 +645,7 @@ describe("/store/carts", () => {
             id: "line-item-2",
             cart_id: discountCart.id,
             variant_id: "test-variant-quantity",
+            product_id: "test-product",
             unit_price: 950,
             quantity: 1,
             adjustments: [
@@ -713,6 +715,7 @@ describe("/store/carts", () => {
             id: "line-item-2",
             cart_id: discountCart.id,
             variant_id: "test-variant-quantity",
+            product_id: "test-product",
             unit_price: 1000,
             quantity: 1,
             adjustments: [
@@ -804,6 +807,7 @@ describe("/store/carts", () => {
         unit_price: 1000,
         quantity: 1,
         variant_id: "test-variant-quantity",
+        product_id: "test-product",
         cart_id: "test-cart-w-total-fixed-discount",
       })
 
@@ -847,6 +851,7 @@ describe("/store/carts", () => {
         unit_price: 1000,
         quantity: 1,
         variant_id: "test-variant-quantity",
+        product_id: "test-product",
         cart_id: "test-cart-w-total-percentage-discount",
       })
 
@@ -890,6 +895,7 @@ describe("/store/carts", () => {
         unit_price: 1000,
         quantity: 1,
         variant_id: "test-variant-quantity",
+        product_id: "test-product",
         cart_id: "test-cart-w-item-fixed-discount",
       })
 
@@ -933,6 +939,7 @@ describe("/store/carts", () => {
         unit_price: 1000,
         quantity: 1,
         variant_id: "test-variant-quantity",
+        product_id: "test-product",
         cart_id: "test-cart-w-item-percentage-discount",
       })
 
@@ -1050,6 +1057,7 @@ describe("/store/carts", () => {
           line_items: [
             {
               variant_id: "test-variant",
+              product_id: "test-product",
               unit_price: 100,
             },
           ],
@@ -1110,6 +1118,7 @@ describe("/store/carts", () => {
           line_items: [
             {
               variant_id: "test-variant",
+              product_id: "test-product",
               unit_price: 100,
             },
           ],
@@ -1260,6 +1269,7 @@ describe("/store/carts", () => {
           line_items: [
             {
               variant_id: "test-variant",
+              product_id: "test-product",
               unit_price: 100,
             },
           ],
@@ -1327,6 +1337,7 @@ describe("/store/carts", () => {
           line_items: [
             {
               variant_id: "test-variant",
+              product_id: "test-product",
               unit_price: 100,
             },
           ],
@@ -1387,6 +1398,7 @@ describe("/store/carts", () => {
           line_items: [
             {
               variant_id: "test-variant",
+              product_id: "test-product",
               unit_price: 100,
             },
           ],
@@ -1457,6 +1469,7 @@ describe("/store/carts", () => {
           line_items: [
             {
               variant_id: "test-variant",
+              product_id: "test-product",
               unit_price: 100,
             },
           ],
@@ -2207,6 +2220,7 @@ describe("/store/carts", () => {
         line_items: [
           {
             variant_id: product.variants[0].id,
+            product_id: product.id,
             quantity: 1,
             unit_price: 1000,
           },
@@ -2251,6 +2265,7 @@ describe("/store/carts", () => {
       line_items: [
         {
           variant_id: product.variants[0].id,
+          product_id: product.id,
           quantity: 1,
           unit_price: 1000,
         },
@@ -2702,7 +2717,13 @@ describe("/store/carts", () => {
       const product = await simpleProductFactory(dbConnection)
       const cart = await simpleCartFactory(dbConnection, {
         region: region.id,
-        line_items: [{ variant_id: product.variants[0].id, quantity: 1 }],
+        line_items: [
+          {
+            variant_id: product.variants[0].id,
+            product_id: product.id,
+            quantity: 1,
+          },
+        ],
         shipping_address: {
           country_code: "us",
         },
@@ -2737,7 +2758,13 @@ describe("/store/carts", () => {
       const product = await simpleProductFactory(dbConnection)
       const cart = await simpleCartFactory(dbConnection, {
         region: region.id,
-        line_items: [{ variant_id: product.variants[0].id, quantity: 1 }],
+        line_items: [
+          {
+            variant_id: product.variants[0].id,
+            product_id: product.id,
+            quantity: 1,
+          },
+        ],
       })
       await simpleShippingOptionFactory(dbConnection, {
         region_id: region.id,
@@ -2769,7 +2796,13 @@ describe("/store/carts", () => {
       const product = await simpleProductFactory(dbConnection)
       const cart = await simpleCartFactory(dbConnection, {
         region: region.id,
-        line_items: [{ variant_id: product.variants[0].id, quantity: 1 }],
+        line_items: [
+          {
+            variant_id: product.variants[0].id,
+            product_id: product.id,
+            quantity: 1,
+          },
+        ],
       })
       await simpleShippingOptionFactory(dbConnection, {
         region_id: region.id,