Merge 529ad5d0a6 into cbb32838fb

src/Sylius/Bundle/AdminBundle/Resources/config/grids/order.yml

@@ -6,7 +6,7 @@ sylius_grid:
                 options:
                     class: "%sylius.model.order.class%"
                     repository:
-                        method: createCriteriaAwareSearchListQueryBuilder
+                        method: createCriteriaAwareGridListQueryBuilder
                         arguments:
                             criteria: $criteria
             sorting:

src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository.php

@@ -57,6 +57,42 @@ class OrderRepository extends BaseOrderRepository implements OrderRepositoryInte
         ;
     }
 
+    public function createGridListQueryBuilder(): QueryBuilder
+    {
+        return $this->createQueryBuilder('o')
+            ->leftJoin('o.customer', 'customer')
+            ->andWhere('o.state != :state')
+            ->setParameter('state', OrderInterface::STATE_CART)
+        ;
+    }
+
+    public function createCriteriaAwareGridListQueryBuilder(?array $criteria): QueryBuilder
+    {
+        if ($criteria === null) {
+            return $this->createGridListQueryBuilder();
+        }
+
+        $hasProductCriteria = '' !== ($criteria['product'] ?? '');
+        $hasVariantCriteria = '' !== ($criteria['variant'] ?? '');
+
+        $queryBuilder = $this->createGridListQueryBuilder();
+
+        if ($hasVariantCriteria || $hasProductCriteria) {
+            $queryBuilder
+                ->leftJoin('o.items', 'item')
+                ->leftJoin('item.variant', 'variant')
+            ;
+        }
+
+        if ($hasProductCriteria) {
+            $queryBuilder
+                ->leftJoin('variant.product', 'product')
+            ;
+        }
+
+        return $queryBuilder;
+    }
+
     public function createCriteriaAwareSearchListQueryBuilder(?array $criteria): QueryBuilder
     {
         if ($criteria === null) {

src/Sylius/Component/Core/Repository/OrderRepositoryInterface.php

@@ -35,6 +35,13 @@ interface OrderRepositoryInterface extends BaseOrderRepositoryInterface
      */
     public function createCriteriaAwareSearchListQueryBuilder(?array $criteria): QueryBuilder;
 
+    public function createGridListQueryBuilder(): QueryBuilder;
+
+    /**
+     * @param array<string, mixed>|null $criteria
+     */
+    public function createCriteriaAwareGridListQueryBuilder(?array $criteria): QueryBuilder;
+
     /**
      * @param array<string, mixed>|null $criteria
      */