Merge branch 'develop' into…

Merge branch 'develop' into 6233-pouvoir-annuler-les-transactions-ccas-du-mois-courant-mais-pas-au-dela

src/Application/Sonata/UserBundle/Admin/UserAdmin.php

@@ -48,14 +48,17 @@ class UserAdmin extends BaseUserAdmin
 
     protected function configureRoutes(RouteCollection $collection)
     {
-        if ($this->isChild()) {
-            $collection->remove('delete');
+        // Remove 'delete' action for non tav envs
+        if (!$this->getConfigurationPool()->getContainer()->getParameter('tav_env')) {
+            if ($this->isChild()) {
+                $collection->remove('delete');
 
-            return;
-        }
+                return;
+            }
 
-        // This is the route configuration as a parent
-        $collection->remove('delete');
+            // This is the route configuration as a parent
+            $collection->remove('delete');
+        }
     }
 
     /**
@@ -83,6 +86,20 @@ class UserAdmin extends BaseUserAdmin
             ])
         ;
 
+        // Add delete action on users in TAV envs for super admin
+        if ($this->isGranted('ROLE_SUPER_ADMIN') && $this->getConfigurationPool()->getContainer()->getParameter('tav_env')) {
+            $listMapper
+                ->remove('_action')
+                ->add('_action', null, [
+                    'label' => 'Actions',
+                    'actions' => [
+                        'edit' => [],
+                        'delete' => []
+                    ],
+                ])
+            ;
+        }
+
         // TODO: SECURITY BREACH, RESET ASAP!!!
         // if ('dev' == $_ENV['APP_ENV'] && $this->isGranted('ROLE_ALLOWED_TO_SWITCH')) {
         if ($this->isGranted('ROLE_ALLOWED_TO_SWITCH')) {

src/Controller/CRUD/CRUDController.php

@@ -9,9 +9,20 @@ use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use App\Utils\CustomEntityManager;
+use App\Entity\User;
+use App\Entity\Flux;
 
 class CRUDController extends Controller
 {
+
+    protected $em;
+
+    public function __construct(CustomEntityManager $em)
+    {
+        $this->em = $em;
+    }
+
     /**
      * Create action.
      *
@@ -211,6 +222,36 @@ class CRUDController extends Controller
 
             return $this->redirectTo($object);
         }
+        if ($object->hasRole('ROLE_API')) {
+            $this->addFlash(
+                'sonata_flash_error',
+                'Vous ne pouvez pas supprimer le compte API !'
+            );
+
+            return $this->redirectTo($object);
+        }
+
+        // Prevent deleting user if flux related to its Adherent account exist
+        if ($object instanceof User)  {
+            $query = $this->em->getRepository(Flux::class)->getQueryByUser($object);
+
+            $hasFluxAdherent = false;
+            if ($object->getAdherent()) {
+                $queryAdherent = $this->em->getRepository(Flux::class)->getQueryByAdherent($object->getAdherent());
+                if (null != $queryAdherent && count($queryAdherent->getResult()) > 0) {
+                    $hasFluxAdherent = true;
+                }
+            }
+
+            if (null != $query && count($query->getResult()) > 0 || $hasFluxAdherent) {
+                $this->addFlash(
+                    'sonata_flash_error',
+                    'Vous ne pouvez pas supprimer ce compte utilisateur : des flux en relation à son compte sont enregistrés.'
+                );
+
+                return $this->redirectTo($object);
+            }
+        }
 
         return parent::deleteAction($id);
     }

src/Controller/UserController.php

@@ -8,6 +8,7 @@ use App\Entity\CotisationPrestataire;
 use App\Entity\GlobalParameter;
 use App\Entity\Payment;
 use App\Entity\Prestataire;
+use App\Entity\Reconversion;
 use App\Entity\TransactionPrestataireAdherent;
 use App\Entity\User;
 use App\Entity\TransactionAdherentPrestataire;
@@ -31,6 +32,7 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Translation\TranslatorInterface;
 use Twig\Environment;
+use App\Entity\Flux;
 
 class UserController extends AbstractController
 {
@@ -285,6 +287,22 @@ class UserController extends AbstractController
             return $this->redirectToRoute('index');
         }
 
+        //Prevent cancelling transactions which happened before a reconversion (to avoid refunding money that's been reconverted)
+        if (
+            $this->em->getRepository(Flux::class)->getQueryByPrestataire(
+                $presta,
+                null,
+                Reconversion::TYPE_RECONVERSION_PRESTATAIRE,
+                $transactionAdherentPrestataire->getCreatedAt()->format("Y-m-d H:i:s")
+            )->getResult()
+        ) {
+            $this->addFlash(
+                'error',
+                'Cette transaction ne plus être annulée car une reconversion a été demandée depuis.'
+            );
+            return $this->redirectToRoute('index');
+        }
+
         //Create new transaction in opposite direction
         $flux = new TransactionPrestataireAdherent();
         $flux->setExpediteur($presta);

src/Entity/Adherent.php

@@ -77,7 +77,7 @@ class Adherent extends AccountableObject implements AccountableInterface
 
     /**
      * @var ArrayCollection|AccountAdherent[]
-     * @ORM\OneToMany(targetEntity="AccountAdherent", mappedBy="adherent")
+     * @ORM\OneToMany(targetEntity="AccountAdherent", mappedBy="adherent", cascade={"remove"})
      */
     private $accounts;
 

src/Form/Type/ListOperationFormType.php

@@ -6,7 +6,7 @@ use App\Enum\MoyenEnum;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -40,13 +40,13 @@ class ListOperationFormType extends AbstractType
                     return MoyenEnum::getTypeName($choice);
                 },
             ])
-            ->add('datemin', DateTimeType::class, [
+            ->add('datemin', DateType::class, [
                 'label' => 'Date min',
                 'required' => false,
                 'widget' => 'single_text',
                 // 'data' => new \DateTime('first day of this month')
             ])
-            ->add('datemax', DateTimeType::class, [
+            ->add('datemax', DateType::class, [
                 'label' => 'Date max',
                 'required' => false,
                 'widget' => 'single_text',

src/Repository/FluxRepository.php

@@ -7,6 +7,7 @@ use App\Entity\Comptoir;
 use App\Entity\Flux;
 use App\Entity\Groupe;
 use App\Entity\Prestataire;
+use App\Entity\User;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -237,6 +238,28 @@ class FluxRepository extends ServiceEntityRepository
         ;
     }
 
+    /**
+     * @param User $user
+     *
+     * @return Query Returns a query fo finding an array of Flux
+     */
+    public function getQueryByUser(User $user)
+    {
+        $sqlQuery = "SELECT f.id FROM {$this->tableName} f WHERE f.user_id = :id";
+        $statement = $this->connection->prepare($sqlQuery);
+        $statement->bindValue(':id', $user->getId());
+        $statement->execute();
+        $results = $statement->fetchAll();
+        $qb = $this->createQueryBuilder('f');
+
+        return $qb
+            ->where($qb->expr()->in('f.id', ':ids'))
+            ->setParameter('ids', $results)
+            ->orderBy('f.createdAt', 'DESC')
+            ->getQuery()
+        ;
+    }
+
     public function getTotalVenteAchat()
     {
         $qb = $this->createQueryBuilder('f');

src/Utils/OperationUtils.php

@@ -60,13 +60,13 @@ class OperationUtils
         if (!empty($request->get('formListOperations')['datemin'])) {
             $qb
                 ->andWhere('a.createdAt >= :datemin')
-                ->setParameter('datemin', $request->get('formListOperations')['datemin'] . ' 00:00:00')
+                ->setParameter('datemin', $request->get('formListOperations')['datemin'])  // Date only comparison: error in queries comparing datetimes with some MYSQL versions
             ;
         }
         if (!empty($request->get('formListOperations')['datemax'])) {
             $qb
                 ->andWhere('a.createdAt <= :datemax')
-                ->setParameter('datemax', $request->get('formListOperations')['datemax'] . ' 23:59:59')
+                ->setParameter('datemax', $request->get('formListOperations')['datemax'])
             ;
         }
         if (!empty($request->get('formListOperations')['moyen'])) {

templates/themes/kohinos/common/menu.html.twig

@@ -80,14 +80,8 @@
 				</a>
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownUC">
                 	{# COMPTE ou ECOMPTE  : @TODO : mettre plutôt dans le header en visible tout le temps ? #}
-                	{% if app.user and is_granted('ROLE_ADHERENT') %}
-                		<b class="dropdown-item bg-primary text-white">
-							{% if app.user.adherent %}
-								Ecompte : {{app.user.adherent.emlcAccount.balance }}
-							{% else %}
-								Adhérent introuvable.
-							{% endif %}
-						</b>
+                	{% if app.user and app.user.adherent and is_granted('ROLE_ADHERENT') %}
+                		<b class="dropdown-item bg-primary text-white"> Ecompte : {{app.user.adherent.emlcAccount.balance }}</b>
                 	{% elseif app.user and is_granted('ROLE_PRESTATAIRE') and getCurrentPrestataire() != null %}
                 		<b class="dropdown-item bg-primary text-white"> Ecompte : {{getCurrentPrestataire().emlcAccount.balance }}</b>
                 	{% elseif getCurrentGroupe() != null %}