Merge pull request #3759 from craftcms/feature/pt-2306-5x-invalid-pur…

…chasable-id-in-cp-create-order-when-order-set

Fixed #3756 purchasables incorrectly returning on order edit

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a bug where purchasables were showing incorrectly on the Edit Order screen. ([#3756](https://github.com/craftcms/commerce/issues/3756))
+
 ## 5.2.2.1 - 2024-11-08
 
 - Fixed a PHP error that could occur when retrieving a variant. ([#3754](https://github.com/craftcms/commerce/issues/3754))

src/controllers/OrdersController.php

@@ -685,6 +685,14 @@ public function actionPurchasablesTable(): Response
                 'and',
                 '[[elements.id]] = [[purchasables.id]]',
             ])
+            // Make sure this purchasable is enabled for the site
+            ->innerJoin(['es' => CraftTable::ELEMENTS_SITES], [
+                'and',
+                '[[es.elementId]] = [[purchasables.id]]',
+                '[[es.siteId]] = :siteId',
+            ], [
+                ':siteId' => $siteId,
+            ])
             ->innerJoin(Table::PURCHASABLES_STORES . ' pstores', '[[purchasables.id]] = [[pstores.purchasableId]]')
             ->where(['elements.enabled' => true])
             ->andWhere(['pstores.storeId' => $store->id])