Merge branch 'develop'

ShopBundle/Repository/OrderShopRepository.php

@@ -169,10 +169,10 @@ class OrderShopRepository extends BaseRepository implements DefaultRepositoryInt
                         $query->andWhere('e.weekDeliveryTruck = :weekDeliveryTruck')->setParameter('weekDeliveryTruck', $params['weekDeliveryTruck']);
                 }
 
-                if(isset($params['deliveryDate'])) {
-                        $query->andWhere('e.deliveryDate >= :deliveryDateStart');
-                        $query->andWhere('e.deliveryDate < :deliveryDateEnd');
-                        $date = clone $params['deliveryDate'];
+                if(isset($params['estimatedDeliveryDateTime'])) {
+                        $query->andWhere('e.estimatedDeliveryDateTime >= :deliveryDateStart');
+                        $query->andWhere('e.estimatedDeliveryDateTime < :deliveryDateEnd');
+                        $date = clone $params['estimatedDeliveryDateTime'];
                         $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'));
                 }