Merge branch 'develop'

Repository/Order/OrderShopRepositoryQuery.php

@@ -38,7 +38,6 @@ class OrderShopRepositoryQuery extends AbstractRepositoryQuery
         parent::__construct($repository, 'orderShop', $paginator);
     }
 
-
     public function selectSumStatTotalWithTax(): self
     {
         return $this
@@ -56,7 +55,6 @@ class OrderShopRepositoryQuery extends AbstractRepositoryQuery
             );
     }
 
-
     public function selectSum(): self
     {
         $this->joinProduct();
@@ -290,6 +288,11 @@ class OrderShopRepositoryQuery extends AbstractRepositoryQuery
         return $this->andWhere('.deliveryDate > :today')->setParameter('today', (new DateTime())->setTime(23, 59));
     }
 
+    public function filterHasOrderProducts()
+    {
+        return $this->andWhere('orderShop.orderProducts IS NOT EMPTY');
+    }
+
     public function selectOrderReductionCarts(): self
     {
         $this->joinOrderReductionCarts();
@@ -297,7 +300,6 @@ class OrderShopRepositoryQuery extends AbstractRepositoryQuery
         return $this->addSelect('orderReductionCarts');
     }
 
-
     public function joinOrderProducts(bool $addSelect = false): self
     {
         if (!$this->isJoinOrderProducts) {