update front + transaction form factory + blocks flux ...

config/services.yaml

@@ -25,7 +25,7 @@ services:
     # this creates a service per class whose id is the fully-qualified class name
     App\:
         resource: '../src/*'
-        exclude: '../src/{DependencyInjection,Listener,Entity,Migrations,Tests,Twig,Kernel.php}'
+        exclude: '../src/{DependencyInjection,Factory,Listener,Entity,Migrations,Tests,Twig,Kernel.php}'
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
@@ -60,6 +60,11 @@ services:
         autowire: false
         arguments: ["@service_container", "@knp_paginator"]
 
+    app.twig.form.extension:
+        class: App\Twig\FormExtension
+        autowire: false
+        arguments: ["@service_container"]
+
     app.twig.menu.extension:
         class: App\Twig\MenuExtension
         autowire: false
@@ -70,6 +75,11 @@ services:
         autowire: false
         arguments: ["@doctrine.orm.entity_manager"]
 
+    app.formfactory:
+        class: App\Factory\FormFactory
+        autowire: true
+        public: true
+
     App\Controller\RegistrationController:
         autowire: false
 
@@ -99,7 +109,7 @@ services:
         public: true
         calls:
             - [ setUserManager, ['@fos_user.user_manager']]
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.all.cotisations:
         class: App\Admin\CotisationAdmin
@@ -111,7 +121,7 @@ services:
               label: "Cotisations"
         public: true
         calls:
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.adherent.cotisations:
         class: App\Admin\CotisationAdherentAdmin
@@ -123,7 +133,7 @@ services:
               label: "Cotisation"
         public: true
         calls:
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     # admin.prestataire.gerer:
     #     class: App\Admin\PrestataireoldAdmin
@@ -149,7 +159,7 @@ services:
         calls:
             - [ setUserManager, ['@fos_user.user_manager']]
             - [ addChild, ['@sonata.user.admin.user', 'user']]
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.prestataire.cotisations:
         class: App\Admin\CotisationPrestataireAdmin
@@ -161,7 +171,7 @@ services:
               label: "Cotisation"
         public: true
         calls:
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.groupe.gerer:
         class: App\Admin\GroupeAdmin
@@ -181,7 +191,7 @@ services:
               label: "Comptoirs"
         public: true
         calls:
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.groupepresta.gerer:
         class: App\Admin\GroupeprestataireAdmin
@@ -193,7 +203,7 @@ services:
               label: "AMAP / Marchés"
         public: true
         calls:
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.news.gerer:
         class: App\Admin\NewsAdmin
@@ -257,7 +267,7 @@ services:
         public: true
         calls:
             - [ setSubClasses, [{transaction: 'App\Entity\Transaction', transfert: 'App\Entity\Transfert', cotisation: 'App\Entity\Cotisation'}]]
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.transfert.gerer:
         class: App\Admin\TransfertAdmin
@@ -270,7 +280,7 @@ services:
               pager_type: "simple"
         public: true
         calls:
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     admin.transaction.gerer:
         class: App\Admin\TransactionAdmin
@@ -283,7 +293,7 @@ services:
               pager_type: "simple"
         public: true
         calls:
-            - [ setTokenStorage, ['@security.token_storage']]
+            - [ setSecurity, ['@security.helper']]
 
     # admin.flux.gerer:
     #     class: App\Admin\FluxAdmin

src/Admin/AdherentAdmin.php

@@ -28,13 +28,13 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class AdherentAdmin extends AbstractAdmin
 {
     protected $baseRouteName = 'adherent';
     protected $baseRoutePattern = 'adherent';
-    protected $tokenStorage;
+    protected $security;
 
     protected $datagridValues = [
         // reverse order (default = 'ASC')
@@ -45,9 +45,9 @@ class AdherentAdmin extends AbstractAdmin
         // '_per_page' => 32
     ];
 
-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    public function setSecurity(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     public function configure()
@@ -60,7 +60,7 @@ class AdherentAdmin extends AbstractAdmin
     */
     public function createQuery($context = 'list')
     {
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user = $this->security->getUser();
         $query = parent::createQuery($context);
         $query
             ->innerJoin($query->getRootAliases()[0] .'.user', 'u')
@@ -173,7 +173,7 @@ class AdherentAdmin extends AbstractAdmin
                             return MoyenEnum::getTypeName($choice);
                         },
                     ));
-        if ($this->tokenStorage->getToken()->getUser()->isGranted('ROLE_TRESORIER')) {
+        if ($this->security->getUser()->isGranted('ROLE_TRESORIER')) {
             $formMapper
                 ->add('user.cotisations.first.cotisationInfos.recu', CheckboxType::class, array('label' => 'Reçu'));
         }

src/Admin/ComptoirAdmin.php

@@ -11,19 +11,19 @@ use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\AdminBundle\Show\ShowMapper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class ComptoirAdmin extends AbstractAdmin
 {
-    protected $tokenStorage;
+    protected $security;
     protected $datagridValues = [
         '_sort_order' => 'ASC',
         '_sort_by' => 'name',
     ];
 
-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    public function setSecurity(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     /**
@@ -32,7 +32,7 @@ class ComptoirAdmin extends AbstractAdmin
     public function createQuery($context = 'list')
     {
         $query = parent::createQuery($context);
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user = $this->security->getUser();
         if ($user->isGranted('ROLE_GESTION_GROUPE') || $user->isGranted('ROLE_CONTACT')) {
             if (empty($user->getGroupesgere())) {
                 $query->andWhere('false');

src/Admin/CotisationAdherentAdmin.php

@@ -23,7 +23,7 @@ class CotisationAdherentAdmin extends CotisationAdmin
     */
     public function createQuery($context = 'list')
     {
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user = $this->security->getUser();
         $query = parent::createQuery($context);
         $query->leftJoin($query->getRootAliases()[0] . '.operateur', 'u')
               ->andWhere('u.adherent IS NOT NULL')

src/Admin/CotisationAdmin.php

@@ -14,13 +14,13 @@ use Sonata\AdminBundle\Show\ShowMapper;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class CotisationAdmin extends AbstractAdmin
 {
     protected $baseRouteName = 'cotisation';
     protected $baseRoutePattern = 'cotisation';
-    protected $tokenStorage;
+    protected $security;
 
     protected $translator;
     protected $datagridValues = [
@@ -28,9 +28,9 @@ class CotisationAdmin extends AbstractAdmin
         '_sort_by' => 'createdAt',
     ];
 
-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    public function setSecurity(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     /**
@@ -64,8 +64,9 @@ class CotisationAdmin extends AbstractAdmin
                     'choice_label' => function ($choice) {
                         return MoyenEnum::getTypeName($choice);
                     },
-                ));
-            if ($this->tokenStorage->getToken() != null && $this->tokenStorage->getToken()->getUser()->isGranted('ROLE_TRESORIER') ) {
+                ))
+        ;
+        if ($this->security->getUser() != null && $this->security->getUser()->isGranted('ROLE_TRESORIER')) {
             $formMapper
                 ->add('cotisationInfos.recu', CheckboxType::class, array('label' => 'Reçu'));
         }
@@ -92,7 +93,7 @@ class CotisationAdmin extends AbstractAdmin
     protected function configureRoutes(RouteCollection $collection)
     {
         $collection->remove('delete');
-        if ($this->tokenStorage->getToken() != null && !$this->tokenStorage->getToken()->getUser()->isGranted('ROLE_TRESORIER') ) {
+        if ($this->security->getUser() != null && !$this->security->getUser()->isGranted('ROLE_TRESORIER')) {
             $collection->clearExcept('list');
         }
     }

src/Admin/CotisationPrestataireAdmin.php

@@ -18,7 +18,7 @@ class CotisationPrestataireAdmin extends CotisationAdmin
     */
     public function createQuery($context = 'list')
     {
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user = $this->security->getUser();
         $query = parent::createQuery($context);
         $query->leftJoin($query->getRootAliases()[0] . '.operateur', 'u')
               ->andWhere('u.prestataire IS NOT NULL')

src/Admin/FluxAdmin.php

@@ -11,13 +11,13 @@ use Sonata\AdminBundle\Form\Type\Filter\ChoiceType;
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\AdminBundle\Show\ShowMapper;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType as SChoiceType;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Translation\TranslatorInterface;
 
 class FluxAdmin extends AbstractAdmin
 {
     protected $translator;
-    protected $tokenStorage;
+    protected $security;
     protected $datagridValues = [
         '_sort_order' => 'DESC',
         '_sort_by' => 'createdAt',
@@ -28,9 +28,9 @@ class FluxAdmin extends AbstractAdmin
         $this->translator = $translator;
     }
 
-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    public function setSecurity(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     /**

src/Admin/GroupeprestataireAdmin.php

@@ -11,11 +11,11 @@ use Sonata\AdminBundle\Show\ShowMapper;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class GroupeprestataireAdmin extends AbstractAdmin
 {
-    protected $tokenStorage;
+    protected $security;
     protected $datagridValues = [
         // reverse order (default = 'ASC')
         '_sort_order' => 'DESC',
@@ -23,9 +23,9 @@ class GroupeprestataireAdmin extends AbstractAdmin
         '_sort_by' => 'updatedAt',
     ];
 
-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    public function setSecurity(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     /**
@@ -33,7 +33,7 @@ class GroupeprestataireAdmin extends AbstractAdmin
     */
     public function createQuery($context = 'list')
     {
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user = $this->security->getUser();
         $query = parent::createQuery($context);
         if ($user->isGranted('ROLE_GESTION_GROUPE') || $user->isGranted('ROLE_CONTACT')) {
             if (empty($user->getGroupesgere())) {

src/Admin/PrestataireAdmin.php

@@ -29,13 +29,13 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class PrestataireAdmin extends AbstractAdmin
 {
     protected $baseRouteName = 'prestataire';
     protected $baseRoutePattern = 'prestataire';
-    protected $tokenStorage;
+    protected $security;
     protected $datagridValues = [
         // reverse order (default = 'ASC')
         '_sort_order' => 'DESC',
@@ -45,9 +45,9 @@ class PrestataireAdmin extends AbstractAdmin
         // '_per_page' => 32
     ];
 
-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    public function setSecurity(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     public function configure()
@@ -348,7 +348,7 @@ class PrestataireAdmin extends AbstractAdmin
     */
     public function createQuery($context = 'list')
     {
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user = $this->security->getUser();
         $query = parent::createQuery($context);
         $query
             ->innerJoin($query->getRootAliases()[0] .'.user', 'u')

src/Admin/TransfertAdmin.php

@@ -12,20 +12,20 @@ use Sonata\AdminBundle\Form\Type\Filter\ChoiceType;
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\AdminBundle\Show\ShowMapper;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType as SChoiceType;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Translation\TranslatorInterface;
 
 class TransfertAdmin extends FluxAdmin
 {
-    protected $tokenStorage;
+    protected $security;
     protected $datagridValues = [
         '_sort_order' => 'DESC',
         '_sort_by' => 'createdAt',
     ];
 
-    public function setTokenStorage(TokenStorageInterface $tokenStorage)
+    public function setSecurity(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     /**
@@ -33,7 +33,7 @@ class TransfertAdmin extends FluxAdmin
     */
     public function createQuery($context = 'list')
     {
-        $user = $this->tokenStorage->getToken()->getUser();
+        $user = $this->security->getUser();
         $query = parent::createQuery($context);
         $query->andWhere($query->getRootAliases()[0].".parenttype = :type")
                 ->setParameter('type', 'transfert');

src/Controller/UserPrestataireController.php

@@ -48,11 +48,12 @@ class UserPrestataireController extends AbstractController
      * @Route("/prestataire/transaction/{type}/", name="transactionPrestatairePrestataire", defaults={"type": "prestataire"})
      * @IsGranted("ROLE_PRESTATAIRE")
      */
-    public function transactionPrestataireAdherentAction($type, Request $request)
+    public function transactionPrestataireAction($type, Request $request)
     {
         $entityName = 'App\Entity\TransactionPrestataire'.ucwords($type);
         $entity = new $entityName();
         $entity->setOperateur($this->getUser());
+        $entity->setExpediteur($this->getUser()->getPrestataire());
         $form = $this->createForm('App\Form\Type\TransactionPrestataire'.ucwords($type).'FormType', $entity);
         $form->handleRequest($request);
 

src/Factory/FormFactory.php

+<?php
+
+namespace App\Factory;
+
+use App\Entity\TransactionAdherentAdherent;
+use App\Entity\TransactionAdherentPrestataire;
+use App\Entity\TransactionPrestataireAdherent;
+use App\Entity\TransactionPrestatairePrestataire;
+use App\Entity\TransfertGroupeComptoir;
+use App\Entity\TransfertSiegeGroupe;
+use App\Entity\User;
+use App\Form\Type\TransactionAdherentAdherentFormType;
+use App\Form\Type\TransactionAdherentPrestataireFormType;
+use App\Form\Type\TransactionPrestataireAdherentFormType;
+use App\Form\Type\TransactionPrestatairePrestataireFormType;
+use App\Form\Type\TransfertGroupeComptoirFormType;
+use App\Form\Type\TransfertSiegeGroupeFormType;
+use Symfony\Component\Form\FormFactoryInterface as FormF;
+use Symfony\Component\Routing\RouterInterface;
+
+class FormFactory
+{
+    public $ff;
+    public $router;
+
+    public function __construct(FormF $ff, RouterInterface $router)
+    {
+        $this->ff = $ff;
+        $this->router = $router;
+    }
+
+    public function getTransactionAdherentAdherentForm(User $user)
+    {
+        if (empty($user) || empty($user->getAdherent())) {
+            return null;
+        }
+        $entity = new TransactionAdherentAdherent();
+        $entity->setOperateur($user);
+        $entity->setExpediteur($user->getAdherent());
+        $form = $this->ff->create(TransactionAdherentAdherentFormType::class, $entity, array('action' => $this->router->generate('transactionAdherentAdherent')));
+
+        return $form->createView();
+    }
+
+    public function getTransactionAdherentPrestataireForm(User $user)
+    {
+        if (empty($user) || empty($user->getAdherent())) {
+            return null;
+        }
+        $entity = new TransactionAdherentPrestataire();
+        $entity->setOperateur($user);
+        $entity->setExpediteur($user->getAdherent());
+        $form = $this->ff->create(TransactionAdherentPrestataireFormType::class, $entity, array('action' => $this->router->generate('transactionAdherentPrestataire')));
+
+        return $form->createView();
+    }
+
+    public function getTransactionPrestataireAdherentForm(User $user)
+    {
+        if (empty($user) || empty($user->getPrestataire())) {
+            return null;
+        }
+        $entity = new TransactionPrestataireAdherent();
+        $entity->setOperateur($user);
+        $entity->setExpediteur($user->getPrestataire());
+        $form = $this->ff->create(TransactionPrestataireAdherentFormType::class, $entity, array('action' => $this->router->generate('transactionPrestataireAdherent')));
+
+        return $form->createView();
+    }
+
+    public function getTransactionPrestatairePrestataireForm(User $user)
+    {
+        if (empty($user) || empty($user->getPrestataire())) {
+            return null;
+        }
+        $entity = new TransactionPrestatairePrestataire();
+        $entity->setOperateur($user);
+        $entity->setExpediteur($user->getPrestataire());
+        $form = $this->ff->create(TransactionPrestatairePrestataireFormType::class, $entity, array('action' => $this->router->generate('transactionPrestatairePrestataire')));
+
+        return $form->createView();
+    }
+
+    // public function getTransfertComptoirToXForm(User $user, $destinataire)
+    // {
+    //     $type = strtolower($type);
+    //     if (empty($user) || empty($user->getComptoirsgere()) || !($type == 'adherent' || $type == 'groupe' || $type == 'prestataire')) {
+    //         return null;
+    //     }
+    //     $class = 'TransactionComptoir'.ucwords($type);
+    //     $entity = new $class();
+    //     $entity->setOperateur($user);
+    //     $entity->setExpediteur($user->getComptoirsgere());
+    //     $form = $this->ff->create('App\Form\Type\TransactionComptoir'.ucwords($type).'FormType', $entity, array('action' => $this->router->generate('transactionComptoir'.ucwords($type))));
+
+    //     return $form->createView();
+    // }
+
+    // public function getTransfertGroupeComptoirForm(User $user)
+    // {
+    //     $type = strtolower($type);
+    //     if (empty($user) || empty($user->getGroupesgere())) {
+    //         return null;
+    //     }
+    //     $class = 'Transaction'.ucwords($type).'Comptoir';
+    //     $entity = new TransfertGroupeComptoir();
+    //     $entity->setOperateur($user);
+    //     $entity->setExpediteur($user->getGroupesgere());
+    //     $form = $this->ff->create(TransfertGroupeComptoirFormType::class, $entity, array('action' => $this->router->generate('transfertGroupeComptoir')));
+
+    //     return $form->createView();
+    // }
+
+    // public function getTransfertSiegeGroupeForm(User $user)
+    // {
+    //     if (empty($user) || !$user->hasRole('ROLE_ADMIN_SIEGE')) {
+    //         return null;
+    //     }
+    //     $entity = new TransfertSiegeGroupe();
+    //     $entity->setOperateur($user);
+    //     $form = $this->ff->create(TransfertSiegeGroupeFormType::class, $entity, array('action' => $this->router->generate('transfertSiegeGroupe')));
+
+    //     return $form->createView();
+    // }
+}

src/Form/Type/AddCotisationFormType.php

@@ -14,24 +14,24 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class AddCotisationFormType extends AbstractType
 {
     protected $em;
-    protected $tk;
+    protected $security;
 
-    public function __construct(EntityManagerInterface $em, TokenStorageInterface $tk)
+    public function __construct(EntityManagerInterface $em, Security $security)
     {
         $this->em = $em;
-        $this->tk = $tk;
+        $this->security = $security;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $now = new \DateTime();
         $flux = $options['data'];
-        if (empty($this->tk->getToken()) || empty($this->tk->getToken()->getUser()) || empty($this->tk->getToken()->getUser()->getId()) || empty($flux) || empty($flux->getExpediteur())) {
+        if (empty($this->security) || empty($this->security->getUser()) || empty($this->security->getUser()->getId()) || empty($flux) || empty($flux->getExpediteur())) {
             throw new \Exception("[FLUX] Opération impossible ! Pas d'utilisateur connecté !");
         }
         $maxvalue = $flux->getExpediteur()->getCompte();
@@ -41,7 +41,7 @@ class AddCotisationFormType extends AbstractType
                 'data_class' => null
             ))
             ->add('operateur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getId(),
+                'data' => $this->security->getUser()->getId(),
                 'data_class' => null,
                 'entity_class' => User::class,
                 'em' => $this->em

src/Form/Type/AdherentInfosFormType.php

@@ -26,19 +26,19 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class AdherentInfosFormType extends AbstractType
 {
     protected $container;
     protected $em;
-    protected $tk;
+    protected $security;
 
-    public function __construct(ContainerInterface $container, EntityManagerInterface $em, TokenStorageInterface $tk)
+    public function __construct(ContainerInterface $container, EntityManagerInterface $em, Security $security)
     {
         $this->container = $container;
         $this->em = $em;
-        $this->tk = $tk;
+        $this->security = $security;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)

src/Form/Type/AdhererFormType.php

@@ -26,19 +26,19 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class AdhererFormType extends AbstractType
 {
     protected $container;
     protected $em;
-    protected $tk;
+    protected $security;
 
-    public function __construct(ContainerInterface $container, EntityManagerInterface $em, TokenStorageInterface $tk)
+    public function __construct(ContainerInterface $container, EntityManagerInterface $em, Security $security)
     {
         $this->container = $container;
         $this->em = $em;
-        $this->tk = $tk;
+        $this->security = $security;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)

src/Form/Type/CotisationInfosFormType.php

@@ -17,15 +17,15 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Security;
 
 class CotisationInfosFormType extends FluxFormType
 {
-    protected $tokenStorage;
+    protected $security;
 
-    public function __construct(TokenStorageInterface $tokenStorage)
+    public function __construct(Security $security)
     {
-        $this->tokenStorage = $tokenStorage;
+        $this->security = $security;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -50,7 +50,7 @@ class CotisationInfosFormType extends FluxFormType
                 'html5' => false,
                 'attr' => ['class' => 'js-datepicker'],
             ));
-            if ($this->tokenStorage->getToken() != null && $this->tokenStorage->getToken()->getUser()->isGranted('ROLE_TRESORIER') ) {
+            if ($this->security->getUser() != null && $this->security->getUser()->isGranted('ROLE_TRESORIER') ) {
                 $builder
                     ->add('recu', CheckboxType::class, array('label' => 'Reçu'));
             }

src/Form/Type/PrestataireInfosFormType.php

@@ -26,19 +26,16 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 class PrestataireInfosFormType extends AbstractType
 {
     protected $container;
     protected $em;
-    protected $tk;
 
-    public function __construct(ContainerInterface $container, EntityManagerInterface $em, TokenStorageInterface $tk)
+    public function __construct(ContainerInterface $container, EntityManagerInterface $em)
     {
         $this->container = $container;
         $this->em = $em;
-        $this->tk = $tk;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)

src/Form/Type/TransactionAdherentPrestataireFormType.php

@@ -16,7 +16,7 @@ class TransactionAdherentPrestataireFormType extends TransactionFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getAdherent()->getId(),
+                'data' => $this->security->getUser()->getAdherent()->getId(),
                 'data_class' => null,
                 'entity_class' => Adherent::class,
                 'em' => $this->em

src/Form/Type/TransactionPrestataireAdherentFormType.php

@@ -16,7 +16,7 @@ class TransactionPrestataireAdherentFormType extends TransactionFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getPrestataire()->getId(),
+                'data' => $this->security->getUser()->getPrestataire()->getId(),
                 'data_class' => null,
                 'entity_class' => Prestataire::class,
                 'em' => $this->em

src/Form/Type/TransactionPrestatairePrestataireFormType.php

@@ -16,7 +16,7 @@ class TransactionPrestatairePrestataireFormType extends TransactionFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getPrestataire()->getId(),
+                'data' => $this->security->getUser()->getPrestataire()->getId(),
                 'data_class' => null,
                 'entity_class' => Prestataire::class,
                 'em' => $this->em

src/Form/Type/TransfertComptoirAdherentFormType.php

@@ -16,7 +16,7 @@ class TransfertComptoirAdherentFormType extends TransfertFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getComptoirsgere()->getId(),
+                'data' => $this->security->getUser()->getComptoirsgere()->getId(),
                 'data_class' => null,
                 'entity_class' => Comptoir::class,
                 'em' => $this->em

src/Form/Type/TransfertComptoirGroupeFormType.php

@@ -16,7 +16,7 @@ class TransfertComptoirGroupeFormType extends TransfertFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getComptoirsgere()->getId(),
+                'data' => $this->security->getUser()->getComptoirsgere()->getId(),
                 'data_class' => null,
                 'entity_class' => Comptoir::class,
                 'em' => $this->em

src/Form/Type/TransfertComptoirPrestataireFormType.php

@@ -16,7 +16,7 @@ class TransfertComptoirPrestataireFormType extends TransfertFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getComptoirsgere()->getId(),
+                'data' => $this->security->getUser()->getComptoirsgere()->getId(),
                 'data_class' => null,
                 'entity_class' => Comptoir::class,
                 'em' => $this->em

src/Form/Type/TransfertGroupeComptoirFormType.php

@@ -17,7 +17,7 @@ class TransfertGroupeComptoirFormType extends TransfertFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getGroupesgere()->getId(),
+                'data' => $this->security->getUser()->getGroupesgere()->getId(),
                 'data_class' => null,
                 'entity_class' => Groupe::class,
                 'em' => $this->em

src/Form/Type/TransfertPrestataireComptoirFormType.php

@@ -16,7 +16,7 @@ class TransfertPrestataireComptoirFormType extends TransfertFormType
     {
         $builder
             ->add('expediteur', HiddenType::class, array(
-                'data' => $this->tk->getToken()->getUser()->getPrestataire()->getId(),
+                'data' => $this->security->getUser()->getPrestataire()->getId(),
                 'data_class' => null,
                 'entity_class' => Prestataire::class,
                 'em' => $this->em

src/Repository/FluxRepository.php

@@ -2,6 +2,7 @@
 
 namespace App\Repository;
 
+use App\Entity\Adherent;
 use App\Entity\Flux;
 use App\Entity\Prestataire;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;

src/Twig/FormExtension.php

+<?php
+
+namespace App\Twig;
+
+use App\Entity\Flux;
+use App\Entity\Groupe;
+use App\Entity\Rubrique;
+use App\Entity\User;
+use App\Factory\FormFactory;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
+use Twig\TwigTest;
+
+class FormExtension extends AbstractExtension
+{
+    public $container;
+
+    public function __construct($container)
+    {
+        $this->container = $container;
+    }
+
+    public function getFunctions()
+    {
+        return [
+            new \Twig_SimpleFunction('getTransactionAdherentAdherentForm', array($this, 'getTransactionAdherentAdherentForm')),
+            new \Twig_SimpleFunction('getTransactionAdherentPrestataireForm', array($this, 'getTransactionAdherentPrestataireForm')),
+            new \Twig_SimpleFunction('getTransactionPrestataireAdherentForm', array($this, 'getTransactionPrestataireAdherentForm')),
+            new \Twig_SimpleFunction('getTransactionPrestatairePrestataireForm', array($this, 'getTransactionPrestatairePrestataireForm')),
+            new \Twig_SimpleFunction('getTransfertComptoirToXForm', array($this, 'getTransfertComptoirToXForm')),
+            new \Twig_SimpleFunction('getTransfertGroupeComptoirForm', array($this, 'getTransfertGroupeComptoirForm')),
+            new \Twig_SimpleFunction('getTransfertSiegeGroupeForm', array($this, 'getTransfertSiegeGroupeForm')),
+        ];
+    }
+
+    public function getTransactionAdherentAdherentForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getTransactionAdherentAdherentForm($user);
+    }
+    public function getTransactionAdherentPrestataireForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getTransactionAdherentPrestataireForm($user);
+    }
+    public function getTransactionPrestataireAdherentForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getTransactionPrestataireAdherentForm($user);
+    }
+    public function getTransactionPrestatairePrestataireForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getTransactionPrestatairePrestataireForm($user);
+    }
+    public function getTransfertComptoirToXForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getTransfertComptoirToXForm($user);
+    }
+    public function getTransfertGroupeComptoirForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getTransfertGroupeComptoirForm($user);
+    }
+    public function getTransfertSiegeGroupeForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getTransfertSiegeGroupeForm($user);
+    }
+}

templates/adherent/block/solde.html.twig

+<div class="card mb-3">
+	<div class="card-header">Solde de mon compte : {{app.user.adherent.ecompte}}</div>
+</div>
\ No newline at end of file

templates/adherent/block/transaction_adherent.html.twig

+{% extends 'block/onetransaction.html.twig' %}
+
+{% block blocktitle %}
+	<i class="fa fa-user mr-4"></i> Virement vers un adhérent
+{% endblock blocktitle %}
+{% block blockcontent %}
+	{% set form = getTransactionAdherentAdherentForm(app.user) %}
+	{{ parent() }}
+{% endblock blockcontent %}
\ No newline at end of file

templates/adherent/block/transaction_presta.html.twig

+{% extends 'block/onetransaction.html.twig' %}
+
+{% block blocktitle %}
+	<i class="fa fa-user mr-4"></i> Virement vers un prestataire
+{% endblock blocktitle %}
+{% block blockcontent %}
+	{% set form = getTransactionAdherentPrestataireForm(app.user) %}
+	{{ parent() }}
+{% endblock blockcontent %}
\ No newline at end of file

templates/block/block_collapse.html.twig

 {% set idcard = idcard|default(random(500)) %}
 <div class="card mb-3">
-	<div class="card-header" data-toggle="collapse" data-target="#collapse{{idcard}}" aria-expanded="false" aria-controls="collapse{{idcard}}">{% block blocktitle %}TITLE with blocktitle{% endblock blocktitle %}</div>
+	<div class="card-header" style='cursor:pointer;' onmouseover="$(this).addClass('border-primary');" onmouseout="$(this).removeClass('border-primary');" data-toggle="collapse" data-target="#collapse{{idcard}}" aria-expanded="false" aria-controls="collapse{{idcard}}">{% block blocktitle %}TITLE with blocktitle{% endblock blocktitle %}</div>
 	<div class="card-body collapse" id="collapse{{idcard}}">
 		<h4 class="card-title">{% block blocksubtitle %}SUBTITLE with blocksubtitle{% endblock blocksubtitle %}</h4>
 		<div class="card-text">

templates/block/cotisations.html.twig

+{% if app.user.cotisations|length > 0 %}
+	{% set idcard = 'cotisationspresta' %}
+	{% extends 'block/block_collapse.html.twig' %}
+
+	{% block blocktitle %}
+		<i class="fa fa-user mr-4"></i> Mes cotisations
+	{% endblock blocktitle %}
+	{% block blocksubtitle %}
+	{% endblock blocksubtitle %}
+	{% block blockcontent %}
+		<ul class='list-group'>
+			{% for cotisation in app.user.cotisations %}
+				<li class="list-group-item">{{cotisation.annee|upper}} : {{cotisation.montant}}&euro; (payée le {{cotisation.createdAt|date('d-m-Y')}})</li>
+			{% endfor %}
+		</ul>
+	{% endblock blockcontent %}
+{% endif %}
\ No newline at end of file

templates/block/onetransaction.html.twig

+{% extends 'block/block_collapse.html.twig' %}
+
+{% block blocktitle %}
+	Transaction
+{% endblock blocktitle %}
+{% block blocksubtitle %}
+{% endblock blocksubtitle %}
+{% block blockcontent %}
+	{{ form_start(form) }}
+	    {% if form.expediteur is defined %}
+	    	{{ form_row(form.expediteur) }}
+		{% endif %}
+	    {% if form.destinataire is defined %}
+	    	{{ form_row(form.destinataire) }}
+	    {% endif %}
+	    {% if form.montant is defined %}
+	    	{{ form_row(form.montant) }}
+	    {% endif %}
+	    {% if form.moyen is defined %}
+	        {{ form_row(form.moyen) }}
+	    {% endif %}
+	    {% if form.reference is defined %}
+	    	{{ form_row(form.reference) }}
+	    {% endif %}
+	    {% if form.save is defined %}
+	    	{{ form_row(form.save) }}
+	    {% endif %}
+	{{ form_end(form) }}
+{% endblock blockcontent %}
\ No newline at end of file

templates/block/transactions.html.twig

+{% set fluxs = getAllFlux(app.user, app.request) %}
+{% if fluxs.getTotalItemCount > 0 %}
+	{% set idcard = 'transactions' %}
+	{% extends 'block/block_collapse.html.twig' %}
+
+	{% block blocktitle %}
+		<i class="fa fa-user mr-4"></i> Opérations
+	{% endblock blocktitle %}
+	{% block blocksubtitle %}
+	{% endblock blocksubtitle %}
+	{% block blockcontent %}
+		<ul class='list-group'>
+			{% for flux in fluxs %}
+				<li class="list-group-item">{{flux.parenttype|capitalize}} à {{flux.destinataire}} {{flux.montant}}&euro; (payée le {{flux.createdAt|date('d-m-Y')}})</li>
+			{% endfor %}
+		</ul>
+	{% endblock blockcontent %}
+{% endif %}
\ No newline at end of file

templates/index.html.twig

@@ -13,6 +13,16 @@
 			<div class='col-6 text-center'>
 				{% if is_granted('ROLE_PRESTATAIRE') %}
 					{% include 'presta/block/solde.html.twig' %}
+					{% include 'block/cotisations.html.twig' %}
+					{% include 'block/transactions.html.twig' %}
+					{% include 'presta/block/transaction_presta.html.twig' %}
+					{% include 'presta/block/transaction_adherent.html.twig' %}
+				{% elseif is_granted('ROLE_ADHERENT') %}
+					{% include 'adherent/block/solde.html.twig' %}
+					{% include 'block/cotisations.html.twig' %}
+					{% include 'block/transactions.html.twig' %}
+					{% include 'adherent/block/transaction_presta.html.twig' %}
+					{% include 'adherent/block/transaction_adherent.html.twig' %}
 				{% endif %}
 			</div>
 			<div class='col-3'>

templates/presta/block/solde.html.twig

-{% set idcard = 'soldepresta' %}
-{% extends 'block/block_collapse.html.twig' %}
-
-{% block blocktitle %}
-	<i class="fa fa-euro ml-4"></i> Solde de mon compte
-{% endblock blocktitle %}
-{% block blocksubtitle %}
-{% endblock blocksubtitle %}
-{% block blockcontent %}
-	Solde : {{app.user.prestataire.compte}} {{'mlc_name'|trans}}
-{% endblock blockcontent %}
+<div class="card mb-3">
+	<div class="card-header">Solde de mon compte : {{app.user.prestataire.compte}}</div>
+</div>
\ No newline at end of file

templates/presta/block/transaction_adherent.html.twig

+{% extends 'block/onetransaction.html.twig' %}
+
+{% block blocktitle %}
+	<i class="fa fa-user mr-4"></i> Virement vers un adhérent
+{% endblock blocktitle %}
+{% block blockcontent %}
+	{% set form = getTransactionPrestataireAdherentForm(app.user) %}
+	{{ parent() }}
+{% endblock blockcontent %}
\ No newline at end of file

templates/presta/block/transaction_presta.html.twig

+{% extends 'block/onetransaction.html.twig' %}
+
+{% block blocktitle %}
+	<i class="fa fa-user mr-4"></i> Virement vers un prestataire
+{% endblock blocktitle %}
+{% block blockcontent %}
+	{% set form = getTransactionPrestatairePrestataireForm(app.user) %}
+	{{ parent() }}
+{% endblock blockcontent %}
\ No newline at end of file

templates/presta/infos.html.twig

@@ -59,7 +59,7 @@
 						{% endfor %}
 					</ul>
 				</div>
-{% endif %}
+			{% endif %}
 			{% if app.user.prestataire.rubriques|length > 0 %}
 				<div class='flux mt-4'>
 					<h4>Mes rubriques :</h4>