Liste points de vente : filtre sur Merchant

ShopBundle/Controller/Admin/AdminController.php

@@ -22,7 +22,14 @@ class AdminController extends EasyAdminController
                         $dqlFilter = sprintf(str_replace('currentMerchant', $this->getUser()->getMerchant()->getId(), $dqlFilter));
                 }
 
-                return parent::createListQueryBuilder($entityClass, $sortDirection, $sortField, $dqlFilter);
+                $queryBuilder = parent::createListQueryBuilder($entityClass, $sortDirection, $sortField, $dqlFilter);
+
+                if($entityClass == 'App\Entity\PointSale') {
+                        $queryBuilder->andWhere(':currentMerchant MEMBER OF entity.merchant')
+                                ->setParameter(':currentMerchant',$this->getUser()->getMerchant()->getId()) ;
+                }
+
+                return $queryBuilder ;
         }
 
 
@@ -60,7 +67,12 @@ class AdminController extends EasyAdminController
 
                 if (method_exists($entity, 'setMerchant')) {
                         $entity->setMerchant($this->security->getUser()->getMerchant());
+                }
 
+                if (method_exists($entity, 'addMerchant')) {
+                        if($entity->getMerchant()->isEmpty()) {
+                                $entity->addMerchant($this->security->getUser()->getMerchant());
+                        }
                 }
 
                 if (method_exists($entity, 'setCreatedAt')) {