Merge branch 'develop'

ShopBundle/Repository/OrderShopRepository.php

@@ -177,6 +177,14 @@ class OrderShopRepository extends BaseRepository implements DefaultRepositoryInt
                         $query->setParameter('deliveryDateEnd', $date->modify('+1 day')->format('Y-m-d 00:00:00'));
                 }
 
+                if(isset($params['deliveryDate'])) {
+                        $query->andWhere('e.deliveryDate >= :deliveryDateStart');
+                        $query->andWhere('e.deliveryDate < :deliveryDateEnd');
+                        $date = clone $params['deliveryDate'];
+                        $query->setParameter('deliveryDateStart', $date->format('Y-m-d 00:00:00'));
+                        $query->setParameter('deliveryDateEnd', $date->modify('+1 day')->format('Y-m-d 00:00:00'));
+                }
+
                 if (isset($params['mergeComplementaryOrderShops'])) {
                         $query->andWhere('e.mainOrderShop IS NULL');
                         $query->leftJoin('e.complementaryOrderShops', 'complementaryOrderShops');