Gestion adresses

ShopBundle/Model/Document.php

@@ -47,7 +47,7 @@ abstract class Document extends AbstractDocumentEntity implements FilterMerchant
 
         /**
          * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\AddressInterface")
-         * @ORM\JoinColumn(nullable=false)
+         * @ORM\JoinColumn(nullable=true)
          */
         protected $buyerAddress;
 

ShopBundle/Repository/OrderShopRepository.php

@@ -154,6 +154,10 @@ class OrderShopRepository extends BaseRepository implements DefaultRepositoryInt
                         $query->andWhere('e.user = :user')->setParameter('user', $params['user']);
                 }
 
+                if(isset($params['address'])) {
+                        $query->andWhere('e.deliveryAddress = :address OR e.invoiceAddress = :address')->setParameter('address', $params['address']);
+                }
+
                 if (isset($params['mergeComplementaryOrderShops'])) {
                         $query->andWhere('e.mainOrderShop IS NULL');
                         $query->leftJoin('e.complementaryOrderShops', 'complementaryOrderShops');