Merge branch 'develop' into feat/inventory-ux-feature

medusajs · Jan 10, 2025 · 149e4d5 · 149e4d5
2 parents 2638460 + ff72509
commit 149e4d5
Show file tree

Hide file tree

Showing 760 changed files with 144,399 additions and 132,660 deletions.
diff --git a/.changeset/afraid-experts-walk.md b/.changeset/afraid-experts-walk.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/utils": patch
+---
+
+feat: add default retry strategy for redis
diff --git a/.changeset/angry-coats-warn.md b/.changeset/angry-coats-warn.md
diff --git a/.changeset/angry-jobs-prove.md b/.changeset/angry-jobs-prove.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/types": patch
+---
+
+fix(types): add missing inventory_items to input of createProductsWorkflow
diff --git a/.changeset/beige-ligers-yawn.md b/.changeset/beige-ligers-yawn.md
diff --git a/.changeset/chatty-zebras-smash.md b/.changeset/chatty-zebras-smash.md
diff --git a/.changeset/dull-chairs-whisper.md b/.changeset/dull-chairs-whisper.md
diff --git a/.changeset/five-roses-swim.md b/.changeset/five-roses-swim.md
diff --git a/.changeset/forty-forks-move.md b/.changeset/forty-forks-move.md
diff --git a/.changeset/grumpy-adults-relate.md b/.changeset/grumpy-adults-relate.md
diff --git a/.changeset/grumpy-ladybugs-tickle.md b/.changeset/grumpy-ladybugs-tickle.md
diff --git a/.changeset/itchy-walls-call.md b/.changeset/itchy-walls-call.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+chore(medusa): Add handler path to the http tracing to be able to group by
diff --git a/.changeset/light-dodos-knock.md b/.changeset/light-dodos-knock.md
diff --git a/.changeset/metal-weeks-retire.md b/.changeset/metal-weeks-retire.md
diff --git a/.changeset/moody-ladybugs-melt.md b/.changeset/moody-ladybugs-melt.md
diff --git a/.changeset/nasty-poets-pretend.md b/.changeset/nasty-poets-pretend.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/pricing": patch
+---
+
+fix(pricing): add null conditions for deleted at during price calculations
diff --git a/.changeset/nice-teachers-design.md b/.changeset/nice-teachers-design.md
diff --git a/.changeset/quick-buttons-raise.md b/.changeset/quick-buttons-raise.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/pricing": patch
+---
+
+fix(pricing): PriceLists of type Sale no longer override default prices when the price list price is higher than the default price.
diff --git a/.changeset/real-pianos-eat.md b/.changeset/real-pianos-eat.md
diff --git a/.changeset/selfish-coats-drop.md b/.changeset/selfish-coats-drop.md
diff --git a/.changeset/silent-lies-knock.md b/.changeset/silent-lies-knock.md
diff --git a/.changeset/silver-comics-give.md b/.changeset/silver-comics-give.md
diff --git a/.changeset/slow-garlics-accept.md b/.changeset/slow-garlics-accept.md
diff --git a/.changeset/soft-elephants-attack.md b/.changeset/soft-elephants-attack.md
diff --git a/.changeset/tall-camels-dance.md b/.changeset/tall-camels-dance.md
diff --git a/.changeset/tiny-moles-build.md b/.changeset/tiny-moles-build.md
@@ -0,0 +1,8 @@
+---
+"@medusajs/medusa": patch
+"@medusajs/test-utils": patch
+"@medusajs/types": patch
+"@medusajs/utils": patch
+---
+
+feat: remove dead code and refactor the logic of resolving plugins
diff --git a/.changeset/two-bananas-switch.md b/.changeset/two-bananas-switch.md
diff --git a/.changeset/unlucky-carpets-remain.md b/.changeset/unlucky-carpets-remain.md
diff --git a/integration-tests/http/__tests__/product/store/product.spec.ts b/integration-tests/http/__tests__/product/store/product.spec.ts
@@ -1172,6 +1172,89 @@ medusaIntegrationTestRunner({
           expect(response.data.products).toEqual(expectation)
         })
 
+        it("should list products with prices with a default price when the price list price is higher and the price list is of type SALE", async () => {
+          const priceList = (
+            await api.post(
+              `/admin/price-lists`,
+              {
+                title: "test price list",
+                description: "test",
+                status: PriceListStatus.ACTIVE,
+                type: PriceListType.SALE,
+                prices: [
+                  {
+                    amount: 3500,
+                    currency_code: "usd",
+                    variant_id: product.variants[0].id,
+                  },
+                ],
+                rules: { "customer.groups.id": [customerGroup.id] },
+              },
+              adminHeaders
+            )
+          ).data.price_list
+
+          let response = await api.get(
+            `/store/products?fields=*variants.calculated_price&region_id=${region.id}`,
+            storeHeadersWithCustomer
+          )
+
+          const expectation = expect.arrayContaining([
+            expect.objectContaining({
+              id: product.id,
+              variants: [
+                expect.objectContaining({
+                  calculated_price: {
+                    id: expect.any(String),
+                    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),
+                      price_list_id: null,
+                      price_list_type: null,
+                      min_quantity: null,
+                      max_quantity: null,
+                    },
+                    original_price: {
+                      id: expect.any(String),
+                      price_list_id: null,
+                      price_list_type: null,
+                      min_quantity: null,
+                      max_quantity: null,
+                    },
+                  },
+                }),
+              ],
+            }),
+          ])
+
+          expect(response.status).toEqual(200)
+          expect(response.data.count).toEqual(3)
+          expect(response.data.products).toEqual(expectation)
+
+          // with only region_id
+          response = await api.get(
+            `/store/products?region_id=${region.id}`,
+            storeHeadersWithCustomer
+          )
+
+          expect(response.status).toEqual(200)
+          expect(response.data.products).toEqual(expectation)
+        })
+
         it("should list products with prices with a override price list price", async () => {
           const priceList = (
             await api.post(
@@ -1254,6 +1337,89 @@ medusaIntegrationTestRunner({
           expect(response.status).toEqual(200)
           expect(response.data.products).toEqual(expectation)
         })
+
+        it("should list products with prices with a override price list price even if the price list price is higher than the default price", async () => {
+          const priceList = (
+            await api.post(
+              `/admin/price-lists`,
+              {
+                title: "test price list",
+                description: "test",
+                status: PriceListStatus.ACTIVE,
+                type: PriceListType.OVERRIDE,
+                prices: [
+                  {
+                    amount: 35000,
+                    currency_code: "usd",
+                    variant_id: product.variants[0].id,
+                  },
+                ],
+                rules: { "customer.groups.id": [customerGroup.id] },
+              },
+              adminHeaders
+            )
+          ).data.price_list
+
+          let response = await api.get(
+            `/store/products?fields=*variants.calculated_price&region_id=${region.id}`,
+            storeHeadersWithCustomer
+          )
+
+          const expectation = expect.arrayContaining([
+            expect.objectContaining({
+              id: product.id,
+              variants: [
+                expect.objectContaining({
+                  calculated_price: {
+                    id: expect.any(String),
+                    is_calculated_price_price_list: true,
+                    is_calculated_price_tax_inclusive: false,
+                    calculated_amount: 35000,
+                    raw_calculated_amount: {
+                      value: "35000",
+                      precision: 20,
+                    },
+                    is_original_price_price_list: true,
+                    is_original_price_tax_inclusive: false,
+                    original_amount: 35000,
+                    raw_original_amount: {
+                      value: "35000",
+                      precision: 20,
+                    },
+                    currency_code: "usd",
+                    calculated_price: {
+                      id: expect.any(String),
+                      price_list_id: priceList.id,
+                      price_list_type: "override",
+                      min_quantity: null,
+                      max_quantity: null,
+                    },
+                    original_price: {
+                      id: expect.any(String),
+                      price_list_id: priceList.id,
+                      price_list_type: "override",
+                      min_quantity: null,
+                      max_quantity: null,
+                    },
+                  },
+                }),
+              ],
+            }),
+          ])
+
+          expect(response.status).toEqual(200)
+          expect(response.data.count).toEqual(3)
+          expect(response.data.products).toEqual(expectation)
+
+          // with only region_id
+          response = await api.get(
+            `/store/products?region_id=${region.id}`,
+            storeHeadersWithCustomer
+          )
+
+          expect(response.status).toEqual(200)
+          expect(response.data.products).toEqual(expectation)
+        })
       })
 
       describe("with inventory items", () => {

diff --git a/packages/admin/admin-bundler/CHANGELOG.md b/packages/admin/admin-bundler/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @medusajs/admin-bundler
 
+## 2.2.0
+
+### Patch Changes
+
+- Updated dependencies [[`47594192b79fbc798cfaf21821b60673745d1374`](https://github.com/medusajs/medusa/commit/47594192b79fbc798cfaf21821b60673745d1374)]:
+  - @medusajs/dashboard@2.2.0
+  - @medusajs/admin-shared@2.2.0
+  - @medusajs/admin-vite-plugin@2.2.0
+
 ## 2.1.3
 
 ### Patch Changes