Merge remote-tracking branch 'origin/v1.x' into v1.x

packages/admin-ui/ui/src/components/molecules/actionables.tsx

@@ -41,32 +41,34 @@ const Actionables: React.FC<ActionablesProps> = ({
             )}
           </DropdownMenu.Trigger>
 
-          <DropdownMenu.Content
-            sideOffset={5}
-            className="bg-grey-0 border-grey-20 rounded-rounded shadow-dropdown p-xsmall z-30 min-w-[200px] border"
-          >
-            {actions.map((action, i) => {
-              return (
-                <DropdownMenu.Item className="mb-1 last:mb-0" key={i}>
-                  {
-                    <Button
-                      variant="ghost"
-                      size="small"
-                      className={clsx("flex w-full justify-start", {
-                        "text-rose-50": action?.variant === "danger",
-                        "pointer-events-none select-none opacity-50":
-                          action?.disabled,
-                      })}
-                      onClick={action?.onClick}
-                    >
-                      {action.icon}
-                      {action.label}
-                    </Button>
-                  }
-                </DropdownMenu.Item>
-              )
-            })}
-          </DropdownMenu.Content>
+          <DropdownMenu.Portal>
+            <DropdownMenu.Content
+              sideOffset={5}
+              className="bg-grey-0 border-grey-20 rounded-rounded shadow-dropdown p-xsmall z-50 min-w-[200px] border"
+            >
+              {actions.map((action, i) => {
+                return (
+                  <DropdownMenu.Item className="mb-1 last:mb-0" key={i}>
+                    {
+                      <Button
+                        variant="ghost"
+                        size="small"
+                        className={clsx("flex w-full justify-start", {
+                          "text-rose-50": action?.variant === "danger",
+                          "pointer-events-none select-none opacity-50":
+                            action?.disabled,
+                        })}
+                        onClick={action?.onClick}
+                      >
+                        {action.icon}
+                        {action.label}
+                      </Button>
+                    }
+                  </DropdownMenu.Item>
+                )
+              })}
+            </DropdownMenu.Content>
+          </DropdownMenu.Portal>
         </DropdownMenu.Root>
       </div>
     )

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

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"
   },

packages/medusa-payment-paypal/src/core/paypal-sdk.ts

@@ -48,7 +48,7 @@ export class PaypalSdk {
    */
   async patchOrder(orderId: string, data?: PatchOrder[]): Promise<void> {
     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" })
   }
 
   /**

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

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",

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

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",

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"] }

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}
+{"id":"https://github.com/medusajs/medusa/releases/tag/v1.20.9","content":"v1.20.9 is out","isCloseable":true}

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(

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