Merge branch 'hotfix' of https://git.logipro.com/raphael/Phoenix into hotfix

src/Phoenix/Repository/SocietyRepository.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Logipro\Phoenix\Repository;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -24,14 +25,13 @@ class SocietyRepository extends ServiceEntityRepository
 	public function findSocietiesByFilter(Filter $filter, bool $usePaginator = true)
 	{
 		$qb = $this->createQueryBuilder('society');
-		
+
 		// Mot-clé
 		$words = $filter->getFilterWords('term');
-		if (count($words) > 0)
-		{
-			foreach ($words as $i => $word)
-			{
-				$qb->andWhere("(society.name LIKE ?$i)"
+		if (count($words) > 0) {
+			foreach ($words as $i => $word) {
+				$qb->andWhere(
+					"(society.name LIKE ?$i)"
 				);
 
 				// Contient le mot cherché
@@ -42,19 +42,18 @@ class SocietyRepository extends ServiceEntityRepository
 		// Tri
 		$sortName = $filter->getSortKey();
 		$sortOrder = $filter->getSortOrder();
-		switch ($sortName)
-		{
+		switch ($sortName) {
 			case 'telephone':
 				$qb->orderBy('society.telephone', $sortOrder);
 				break;
 
 			case 'email':
-			$qb->orderBy('society.email', $sortOrder);
-				break;				
+				$qb->orderBy('society.email', $sortOrder);
+				break;
 
 			case 'department':
-				$qb->orderBy('society.addressPostcode', $sortOrder);
-				break;				
+				$qb->orderBy('society.addressPostcodeHeadOffice', $sortOrder);
+				break;
 
 			case 'societyId':
 				$qb->orderBy('society.societyId', $sortOrder);
@@ -69,12 +68,11 @@ class SocietyRepository extends ServiceEntityRepository
 		$service = $this->container->get('phxSettings');
 		$defaultSociety = $service->getDefaultSociety();
 		$qb->andWhere('society.societyId != :idnot');
-		$qb->setParameter('idnot',$defaultSociety->getSocietyId());
+		$qb->setParameter('idnot', $defaultSociety->getSocietyId());
 
 		$query = $qb->getQuery();
-		
-		if ($usePaginator)
-		{
+
+		if ($usePaginator) {
 			$paginator = new Paginator($query);
 
 			$filter->paginate($paginator);
@@ -101,7 +99,7 @@ class SocietyRepository extends ServiceEntityRepository
 		$result = $query->execute();
 
 		return !empty($result);
-	}	
+	}
 
 	/**
 	 * Retourne si le contact est un responsable Administratif dans une société
@@ -120,9 +118,9 @@ class SocietyRepository extends ServiceEntityRepository
 		$result = $query->execute();
 
 		return !empty($result);
-	}	
-	
-	
+	}
+
+
 	/**
 	 * Retourne si le contact est un responsable RH dans une société
 	 * @param int $personId
@@ -140,9 +138,9 @@ class SocietyRepository extends ServiceEntityRepository
 		$result = $query->execute();
 
 		return !empty($result);
-	}	
-	
-/**
+	}
+
+	/**
 	 *
 	 * @param string $term
 	 * @return mixed|\Doctrine\DBAL\Driver\Statement|array|NULL
@@ -153,11 +151,10 @@ class SocietyRepository extends ServiceEntityRepository
 
 		// Mot-clé
 		$words = SearchTools::splitWords($term);
-		if (count($words) > 0)
-		{
-			foreach ($words as $i => $word)
-			{
-				$qb->andWhere("(society.name LIKE ?$i)"
+		if (count($words) > 0) {
+			foreach ($words as $i => $word) {
+				$qb->andWhere(
+					"(society.name LIKE ?$i)"
 				);
 
 				// Contient le mot cherché
@@ -170,10 +167,10 @@ class SocietyRepository extends ServiceEntityRepository
 		$service = $this->container->get('phxSettings');
 		$defaultSociety = $service->getDefaultSociety();
 		$qb->andWhere('society.societyId != :idnot');
-		$qb->setParameter('idnot',$defaultSociety->getSocietyId());
+		$qb->setParameter('idnot', $defaultSociety->getSocietyId());
 
 		$query = $qb->getQuery();
 
 		return $query->execute();
-	}	
-}
+	}
+}