From 363bcc65b5cd21d8941be954b91868fcdefd3890 Mon Sep 17 00:00:00 2001 From: olivermrbl Date: Mon, 29 Jul 2024 13:41:26 +0200 Subject: [PATCH 1/7] chore: Add missing changeset --- .changeset/brown-vans-destroy.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/brown-vans-destroy.md diff --git a/.changeset/brown-vans-destroy.md b/.changeset/brown-vans-destroy.md new file mode 100644 index 0000000000000..93b9df5a89ccd --- /dev/null +++ b/.changeset/brown-vans-destroy.md @@ -0,0 +1,5 @@ +--- +"@medusajs/medusa": patch +--- + +fix: Correctly pass cart_id to price calculation From 4fedaae01e93c10f37ae90d70af3dd70614b5683 Mon Sep 17 00:00:00 2001 From: olivermrbl Date: Mon, 29 Jul 2024 13:44:02 +0200 Subject: [PATCH 2/7] chore: Version packages --- .changeset/brown-vans-destroy.md | 5 ----- .changeset/strange-knives-check.md | 5 ----- .changeset/stupid-pans-clap.md | 5 ----- packages/admin/CHANGELOG.md | 6 ++++++ packages/admin/package.json | 4 ++-- packages/medusa-payment-stripe/CHANGELOG.md | 6 ++++++ packages/medusa-payment-stripe/package.json | 6 +++--- packages/medusa/CHANGELOG.md | 6 ++++++ packages/medusa/package.json | 2 +- yarn.lock | 10 +++++----- 10 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 .changeset/brown-vans-destroy.md delete mode 100644 .changeset/strange-knives-check.md delete mode 100644 .changeset/stupid-pans-clap.md diff --git a/.changeset/brown-vans-destroy.md b/.changeset/brown-vans-destroy.md deleted file mode 100644 index 93b9df5a89ccd..0000000000000 --- a/.changeset/brown-vans-destroy.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@medusajs/medusa": patch ---- - -fix: Correctly pass cart_id to price calculation diff --git a/.changeset/strange-knives-check.md b/.changeset/strange-knives-check.md deleted file mode 100644 index 32ea4d6fb9b57..0000000000000 --- a/.changeset/strange-knives-check.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@medusajs/admin": patch ---- - -fix(admin): Allow `backend` arg to pass through in development diff --git a/.changeset/stupid-pans-clap.md b/.changeset/stupid-pans-clap.md deleted file mode 100644 index 8cf5328f1797b..0000000000000 --- a/.changeset/stupid-pans-clap.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"medusa-payment-stripe": patch ---- - -Show correct paid amount in Stripe payment widget diff --git a/packages/admin/CHANGELOG.md b/packages/admin/CHANGELOG.md index 1c285210f42c0..f5cc7ad729aeb 100644 --- a/packages/admin/CHANGELOG.md +++ b/packages/admin/CHANGELOG.md @@ -1,5 +1,11 @@ # @medusajs/admin +## 7.1.16 + +### Patch Changes + +- [#8231](https://github.com/medusajs/medusa/pull/8231) [`0f76d9f7a4`](https://github.com/medusajs/medusa/commit/0f76d9f7a4a139377b35024b15c868a2023d24b6) Thanks [@kasperkristensen](https://github.com/kasperkristensen)! - fix(admin): Allow `backend` arg to pass through in development + ## 7.1.15 ### Patch Changes diff --git a/packages/admin/package.json b/packages/admin/package.json index eebd74b029794..d3a3e9d5dfad2 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -1,6 +1,6 @@ { "name": "@medusajs/admin", - "version": "7.1.15", + "version": "7.1.16", "bin": { "medusa-admin": "./bin/medusa-admin.js" }, @@ -49,7 +49,7 @@ "@medusajs/medusa": "^1.14.0" }, "devDependencies": { - "@medusajs/medusa": "^1.20.8", + "@medusajs/medusa": "^1.20.9", "@types/express": "^4.17.13", "typescript": "^4.9.3" }, diff --git a/packages/medusa-payment-stripe/CHANGELOG.md b/packages/medusa-payment-stripe/CHANGELOG.md index 6418e39a8b508..1f17bc20476f4 100644 --- a/packages/medusa-payment-stripe/CHANGELOG.md +++ b/packages/medusa-payment-stripe/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.0.11 + +### Patch Changes + +- [#8234](https://github.com/medusajs/medusa/pull/8234) [`3a2a6bc3b3`](https://github.com/medusajs/medusa/commit/3a2a6bc3b3270c7adc05f5c4cf9aa30389689fdf) Thanks [@pepijn-vanvlaanderen](https://github.com/pepijn-vanvlaanderen)! - Show correct paid amount in Stripe payment widget + ## 6.0.10 ### Patch Changes diff --git a/packages/medusa-payment-stripe/package.json b/packages/medusa-payment-stripe/package.json index ea95443a17541..8047e493340ab 100644 --- a/packages/medusa-payment-stripe/package.json +++ b/packages/medusa-payment-stripe/package.json @@ -1,6 +1,6 @@ { "name": "medusa-payment-stripe", - "version": "6.0.10", + "version": "6.0.11", "description": "Stripe Payment provider for Medusa Commerce", "main": "dist/index.js", "repository": { @@ -23,8 +23,8 @@ "watch": "tsc --watch" }, "devDependencies": { - "@medusajs/admin": "^7.1.15", - "@medusajs/medusa": "^1.20.8", + "@medusajs/admin": "^7.1.16", + "@medusajs/medusa": "^1.20.9", "@swc/core": "^1.4.8", "@swc/jest": "^0.2.36", "@tanstack/react-table": "^8.7.9", diff --git a/packages/medusa/CHANGELOG.md b/packages/medusa/CHANGELOG.md index 5068e50cff900..877cfb2371688 100644 --- a/packages/medusa/CHANGELOG.md +++ b/packages/medusa/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 1.20.9 + +### Patch Changes + +- [`363bcc65b5`](https://github.com/medusajs/medusa/commit/363bcc65b5cd21d8941be954b91868fcdefd3890) Thanks [@olivermrbl](https://github.com/olivermrbl)! - fix: Correctly pass cart_id to price calculation + ## 1.20.8 ### Patch Changes diff --git a/packages/medusa/package.json b/packages/medusa/package.json index 91ebabb5ee7ba..99b35159e322a 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -1,6 +1,6 @@ { "name": "@medusajs/medusa", - "version": "1.20.8", + "version": "1.20.9", "description": "Building blocks for digital commerce", "main": "dist/index.js", "bin": "./cli.js", diff --git a/yarn.lock b/yarn.lock index 0bfc4e8adcb83..a0cb3e31283c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8517,12 +8517,12 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/admin@^7.1.15, @medusajs/admin@workspace:packages/admin": +"@medusajs/admin@^7.1.16, @medusajs/admin@workspace:packages/admin": version: 0.0.0-use.local resolution: "@medusajs/admin@workspace:packages/admin" dependencies: "@medusajs/admin-ui": ^2.1.16 - "@medusajs/medusa": ^1.20.8 + "@medusajs/medusa": ^1.20.9 "@rollup/plugin-alias": 5.0.0 "@rollup/plugin-commonjs": 24.1.0 "@rollup/plugin-json": 6.0.0 @@ -9137,7 +9137,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/medusa@^1.20.8, @medusajs/medusa@workspace:*, @medusajs/medusa@workspace:^, @medusajs/medusa@workspace:packages/medusa": +"@medusajs/medusa@^1.20.8, @medusajs/medusa@^1.20.9, @medusajs/medusa@workspace:*, @medusajs/medusa@workspace:^, @medusajs/medusa@workspace:packages/medusa": version: 0.0.0-use.local resolution: "@medusajs/medusa@workspace:packages/medusa" dependencies: @@ -39214,8 +39214,8 @@ __metadata: version: 0.0.0-use.local resolution: "medusa-payment-stripe@workspace:packages/medusa-payment-stripe" dependencies: - "@medusajs/admin": ^7.1.15 - "@medusajs/medusa": ^1.20.8 + "@medusajs/admin": ^7.1.16 + "@medusajs/medusa": ^1.20.9 "@medusajs/utils": ^1.11.10 "@swc/core": ^1.4.8 "@swc/jest": ^0.2.36 From 0ba49bebf7a12ba5bcf8de655e2df354068bb716 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 13:56:08 +0200 Subject: [PATCH 3/7] chore(docs): Generated Docs Announcement Bar (automated) (#8329) Co-authored-by: olivermrbl --- www/apps/docs/announcement.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/apps/docs/announcement.json b/www/apps/docs/announcement.json index bfb4419016771..450894167c9bf 100644 --- a/www/apps/docs/announcement.json +++ b/www/apps/docs/announcement.json @@ -1 +1 @@ -{"id":"https://github.com/medusajs/medusa/releases/tag/v1.20.8","content":"v1.20.8 is out","isCloseable":true} \ No newline at end of file +{"id":"https://github.com/medusajs/medusa/releases/tag/v1.20.9","content":"v1.20.9 is out","isCloseable":true} \ No newline at end of file From be654e6b9471f1afd39332b400291bc9f6d203c1 Mon Sep 17 00:00:00 2001 From: Adil <68734155+adevinwild@users.noreply.github.com> Date: Wed, 31 Jul 2024 08:58:15 +0200 Subject: [PATCH 4/7] fix(admin-ui): Fixed DropdownMenu inside a Modal zIndex issues (#8358) --- .../src/components/molecules/actionables.tsx | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/packages/admin-ui/ui/src/components/molecules/actionables.tsx b/packages/admin-ui/ui/src/components/molecules/actionables.tsx index b66c80233ec72..11b1490cd8a87 100644 --- a/packages/admin-ui/ui/src/components/molecules/actionables.tsx +++ b/packages/admin-ui/ui/src/components/molecules/actionables.tsx @@ -41,32 +41,34 @@ const Actionables: React.FC = ({ )} - - {actions.map((action, i) => { - return ( - - { - - } - - ) - })} - + + + {actions.map((action, i) => { + return ( + + { + + } + + ) + })} + + ) From 226b70564ab8108d820d87bd4e1d8c29a18dfaea Mon Sep 17 00:00:00 2001 From: Adil <68734155+adevinwild@users.noreply.github.com> Date: Wed, 31 Jul 2024 09:05:43 +0200 Subject: [PATCH 5/7] fix: Check if the SalesChannels FF is enabled on `/admin/products` (#8357) Co-authored-by: Adil --- .../medusa/src/api/routes/admin/products/list-products.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/medusa/src/api/routes/admin/products/list-products.ts b/packages/medusa/src/api/routes/admin/products/list-products.ts index f1d9200090565..c032be2366280 100644 --- a/packages/medusa/src/api/routes/admin/products/list-products.ts +++ b/packages/medusa/src/api/routes/admin/products/list-products.ts @@ -9,7 +9,7 @@ import { import { listProducts } from "../../../../utils" import { IInventoryService } from "@medusajs/types" -import { MedusaV2Flag } from "@medusajs/utils" +import { MedusaV2Flag, SalesChannelFeatureFlag } from "@medusajs/utils" import { Type } from "class-transformer" import { Product } from "../../../../models" import { PricedProduct } from "../../../../types/pricing" @@ -305,7 +305,11 @@ export default async (req, res) => { // We only set availability if variants are requested const shouldSetAvailability = relations?.includes("variants") - if (inventoryService && shouldSetAvailability) { + if ( + inventoryService && + shouldSetAvailability && + featureFlagRouter.isFeatureEnabled(SalesChannelFeatureFlag.key) + ) { const [salesChannelsIds] = await salesChannelService.listAndCount( {}, { select: ["id"] } From 7c3a78c8a878adeb6df57bd6c9953ef1ce65ab56 Mon Sep 17 00:00:00 2001 From: Muhammad Elsaeed Date: Mon, 5 Aug 2024 10:31:05 +0300 Subject: [PATCH 6/7] docs: fix service crud example (#8439) --- www/apps/docs/content/development/services/create-service.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/apps/docs/content/development/services/create-service.mdx b/www/apps/docs/content/development/services/create-service.mdx index 80cf4cb15d534..52f8cab8f0ea7 100644 --- a/www/apps/docs/content/development/services/create-service.mdx +++ b/www/apps/docs/content/development/services/create-service.mdx @@ -632,7 +632,7 @@ You can refer to the [Entities](../entities/create.mdx#adding-relations) documen ) } - return + return author } async create( From c24fdb503860b1c670b804f4f35fbe8716f409e7 Mon Sep 17 00:00:00 2001 From: Zarar Siddiqi Date: Wed, 7 Aug 2024 05:06:58 -0400 Subject: [PATCH 7/7] fix: Pass in data to PATCH call so cart amount is updated on quantity change(#8456) --- packages/medusa-payment-paypal/src/core/paypal-sdk.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/medusa-payment-paypal/src/core/paypal-sdk.ts b/packages/medusa-payment-paypal/src/core/paypal-sdk.ts index bd0f09be0bfe4..cec0dd9c42c13 100644 --- a/packages/medusa-payment-paypal/src/core/paypal-sdk.ts +++ b/packages/medusa-payment-paypal/src/core/paypal-sdk.ts @@ -48,7 +48,7 @@ export class PaypalSdk { */ async patchOrder(orderId: string, data?: PatchOrder[]): Promise { const url = PaypalApiPath.PATCH_ORDER.replace("{id}", orderId) - return await this.httpClient_.request({ url, method: "PATCH" }) + return await this.httpClient_.request({ url, data, method: "PATCH" }) } /**