Merge branch 'develop'

Repository/Order/OrderShopRepositoryQuery.php

@@ -6,6 +6,7 @@ use Knp\Component\Pager\PaginatorInterface;
 use Lc\CaracoleBundle\Model\Address\AddressInterface;
 use Lc\CaracoleBundle\Model\Distribution\DistributionInterface;
 use Lc\CaracoleBundle\Model\Order\OrderPaymentInterface;
+use Lc\CaracoleBundle\Model\Order\OrderShopModel;
 use Lc\CaracoleBundle\Model\Product\ProductInterface;
 use Lc\CaracoleBundle\Model\Reduction\ReductionCartInterface;
 use Lc\CaracoleBundle\Model\Reduction\ReductionCreditInterface;
@@ -88,6 +89,16 @@ class OrderShopRepositoryQuery extends AbstractRepositoryQuery
             ->select('count(DISTINCT(orderShop.id)) as total');
     }
 
+    public function filterIsDeliveryHome(): self
+    {
+        return $this->andWhere('.deliveryType = :deliveryType')->setParameter('deliveryType', OrderShopModel::DELIVERY_TYPE_HOME);
+    }
+
+    public function filterIsDeliveryPointSale(): self
+    {
+        return $this->andWhere('.deliveryType = :deliveryType')->setParameter('deliveryType', OrderShopModel::DELIVERY_TYPE_POINTSALE);
+    }
+
     public function joinUser(): self
     {
         if (!$this->isJoinUser) {

Repository/Order/OrderShopStore.php

@@ -388,6 +388,14 @@ class OrderShopStore extends AbstractStore
 
     protected function applyGetByFilters(array $params, $query)
     {
+        if (isset($params['isDeliveryHome']) && $params['isDeliveryHome']) {
+            $query->filterIsDeliveryHome();
+        }
+
+        if (isset($params['isDeliveryPointSale']) && $params['isDeliveryPointSale']) {
+            $query->filterIsDeliveryPointSale();
+        }
+
         if (isset($params['isMerchantOnline'])) {
             $query->filterIsMerchantOnline();
         }