Merge branch '4196-bonification' into 'develop'

4196 bonification

See merge request cooperatic/kohinos-tav!14

assets/css/app.css

@@ -100,4 +100,9 @@ legend.required:after {
     font-style: italic;
     margin-top: -10px;
     margin-bottom: 20px;
+}
+
+.formEncaisserCotisationAdherent-no-profile {
+    font-style: italic;
+    color: #ff4136;
 }
\ No newline at end of file

assets/js/app.js

@@ -521,6 +521,32 @@ $(function() {
     $("#code-visual").text("*".repeat(code.length));
   });
 
+  $("#formEncaisserCotisationAdherent_destinataire").on("change", function() {
+    const cotisationMontants = JSON.parse($("#formEncaisserCotisationAdherent_cotisationMontants").val());
+    let cotisationmontant = cotisationMontants[this.value];
+    console.log(cotisationmontant);
+
+    if (cotisationmontant === undefined) {
+      $("#formEncaisserCotisationAdherent-montant-container").hide();
+      $("#formEncaisserCotisationAdherent-no-profile").hide();
+      return;
+    }
+
+    if (cotisationmontant !== null) {
+      $("#formEncaisserCotisationAdherent-montant-display").text(`${cotisationmontant} €`);
+      $("#formEncaisserCotisationAdherent-montant-container").show();
+      $("#formEncaisserCotisationAdherent-no-profile").hide();
+
+      $("#formEncaisserCotisationAdherent_save").prop("disabled",false);
+    } else {
+      // no cotisation profile
+      $("#formEncaisserCotisationAdherent-montant-container").hide();
+      $("#formEncaisserCotisationAdherent-no-profile").show();
+
+      $("#formEncaisserCotisationAdherent_save").prop("disabled",true);
+    }
+  });
+
   // $('.js-datepicker').datepicker({
   //     closeText: 'Fermer',
   //     prevText: '<Préc',

public/build/entrypoints.json

@@ -3,10 +3,10 @@
     "app": {
       "js": [
         "/build/runtime.6ad5c9da.js",
-        "/build/app.d475cc01.js"
+        "/build/app.79a96478.js"
       ],
       "css": [
-        "/build/app.0815270c.css"
+        "/build/app.2a0f820a.css"
       ]
     },
     "admin": {

public/build/manifest.json

 {
-  "build/app.css": "/build/app.0815270c.css",
-  "build/app.js": "/build/app.d475cc01.js",
+  "build/app.css": "/build/app.2a0f820a.css",
+  "build/app.js": "/build/app.79a96478.js",
   "build/admin.css": "/build/admin.5dc0eea7.css",
   "build/admin.js": "/build/admin.8a6adf4b.js",
   "build/runtime.js": "/build/runtime.6ad5c9da.js",

src/Admin/AdherentAdmin.php

@@ -171,10 +171,11 @@ class AdherentAdmin extends AbstractAdmin
                 ->tab('General')
                     ->with('Profil de cotisation', ['class' => 'col-md-5'])
                         ->add('profilDeCotisation', ChoiceType::class, [
-                            'required' => false,
-                            'label' => 'Choix du profil : ',
+                            'required' => true,
+                            'label' => 'Choix du profil :',
                             'choices' => $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(ProfilDeCotisation::class)->findAll(),
                             'empty_data' => null,
+                            'placeholder' => 'Choisir un profil',
                             'choice_label' => function ($choice, $key, $value) {
                                 if (null === $choice) {
                                     return '';

src/Controller/FluxController.php

@@ -22,6 +22,7 @@ use App\Flux\FluxInterface;
 use App\Security\LoginAuthenticator;
 use App\Utils\CustomEntityManager;
 use App\Utils\OperationUtils;
+use App\Utils\TAVCotisationUtils;
 use FOS\UserBundle\Model\UserManagerInterface;
 use FOS\UserBundle\Util\TokenGeneratorInterface;
 use Gamez\Symfony\Component\Serializer\Normalizer\UuidNormalizer;
@@ -105,6 +106,7 @@ class FluxController extends AbstractController
         Payum $payum,
         Environment $templating,
         OperationUtils $operationUtils,
+        TAVCotisationUtils $tavCotisationsUtils,
         TokenGeneratorInterface $tokenGenerator,
         ValidatorInterface $validator,
         CsrfTokenManagerInterface $tokenManager
@@ -123,6 +125,7 @@ class FluxController extends AbstractController
         $this->tokenGenerator = $tokenGenerator;
         $this->validator = $validator;
         $this->tokenManager = $tokenManager;
+        $this->tavCotisationsUtils = $tavCotisationsUtils;
     }
 
     protected function manageFluxForm(Request $request, Form $form, $template = '@kohinos/flux/transaction.html.twig', $params = [])

src/Controller/UserAdherentController.php

@@ -136,19 +136,46 @@ class UserAdherentController extends FluxController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            // TODO: set CB payment when functionality validated
+            // TODO: set CB payment when the functionality is validated
+
             $flux = $form->getData();
 
+            // Look for existing cotisation
+            if ($this->tavCotisationsUtils->checkExistingCotisation($flux)) {
+                $this->addFlash(
+                    'error',
+                    $this->translator->trans('Cotisation déjà payée ce mois-ci.')
+                );
+
+                return $this->redirectToRoute('index');
+            }
+
+            $destinataire = $flux->getDestinataire();
+            $profile = $destinataire->getProfilDeCotisation();
+
+            if (is_null($profile)) {
+                $this->addFlash(
+                    'error',
+                    $this->translator->trans('Opération impossible : vous n\'avez pas de profil de cotisation associé. Veuillez contacter un administrateur.')
+                );
+
+                return $this->redirectToRoute('index');
+            }
+
             if (null == $flux->getDon() || 0 == $flux->getDon()->getMontant()) {
                 $flux->setDon(null);
             }
 
             $this->em->persist($flux);
             $this->operationUtils->executeOperations($flux);
+
+            // Apply cotisation rate, create new flux
+            $this->tavCotisationsUtils->applyTauxCotisation($flux);
+            
             $this->em->flush();
             $this->addFlash(
                 'success',
-                $this->translator->trans('Cotisation payée ! [Payzen désactivé en attent du compte ; bonification et mensualité pas encore implémentés]')
+                $this->translator->trans('Cotisation payée ! [Payzen désactivé en attent du compte]')
             );
 
             return $this->redirectToRoute('index');

src/Controller/UserComptoirController.php

@@ -21,6 +21,7 @@ use App\Form\Type\VenteComptoirAdherentFormType;
 use App\Form\Type\VenteComptoirPrestataireFormType;
 use App\Form\Type\VenteEmlcAdherentFormType;
 use App\Form\Type\VenteEmlcPrestataireFormType;
+use App\Form\Type\EncaisserCotisationAdherentFormType;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -186,4 +187,60 @@ class UserComptoirController extends FluxController
             $form
         );
     }
+
+    /**
+     * @Route("/user/comptoir/encaisser/cotisation/adherent/", name="comptoirEncaisserCotisation")
+     * @IsGranted("ROLE_COMPTOIR")
+     */
+    public function comptoirEncaisserCotisationAction(Request $request)
+    {
+        $entity = new VenteEmlcComptoirAdherent();
+        $entity->setOperateur($this->getUser());
+        $form = $this->createForm(EncaisserCotisationAdherentFormType::class, $entity);
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $flux = $form->getData();
+
+            // Look for existing cotisation
+            if ($this->tavCotisationsUtils->checkExistingCotisation($flux)) {
+                $this->addFlash(
+                    'error',
+                    $this->translator->trans('L\'adhérent•e a déjà payé sa cotisation ce mois-ci.')
+                );
+
+                return $this->redirectToRoute('index');
+            }
+
+            $destinataire = $flux->getDestinataire();
+            $profile = $destinataire->getProfilDeCotisation();
+
+            if (is_null($profile)) {
+                $this->addFlash(
+                    'error',
+                    $this->translator->trans('Opération impossible : l\'habitant.e n\'a pas de profil de cotisation associé.')
+                );
+
+                return $this->redirectToRoute('index');
+            }
+
+            $cotisationAmount = $profile->getMontant();  // Amount in € paid by the user
+            $flux->setMontant($cotisationAmount);
+            
+            $this->em->persist($flux);
+            $this->operationUtils->executeOperations($flux);
+
+            // Apply cotisation rate, create new flux
+            $this->tavCotisationsUtils->applyTauxCotisation($flux);
+
+            $this->em->flush();
+            
+            $this->addFlash(
+                'success',
+                $this->translator->trans('Opération réussie !')
+            );
+        }
+
+        return $this->redirectToRoute('index');
+    }
 }

src/Entity/Flux.php

@@ -54,6 +54,9 @@ use Symfony\Component\Validator\Constraints as Assert;
  *     "ticket_fix" = "TicketFix",
  *     "ticket_fix_print" = "TicketFixPrint",
  *     "ticket_fix_destroy" = "TicketFixDestroy",
+ *     "application_taux_cotisation" = "TauxCotisationApplication",
+ *     "reversement_cotisation_adherent" = "TauxCotisationReversement",
+ *     "prelevement_cotisation_adherent" = "TauxCotisationPrelevement",
  * })
  */
 abstract class Flux implements FluxInterface
@@ -71,6 +74,7 @@ abstract class Flux implements FluxInterface
     const TYPE_VENTE = 'vente';
     const TYPE_VENTE_EMLC = 'vente_emlc';
     const TYPE_TICKET_FIX = 'ticket_fix';
+    const TYPE_APPLICATION_TAUX_COTISATION = 'application_taux_cotisation';
 
     /**
      * @var \Ramsey\Uuid\UuidInterface
@@ -116,7 +120,7 @@ abstract class Flux implements FluxInterface
      *
      * @var string
      *
-     * @ORM\Column(name="parenttype", type="string", length=20)
+     * @ORM\Column(name="parenttype", type="string", length=30)
      * @Assert\NotBlank
      * @Groups({"read", "write"})
      */

src/Entity/TauxCotisationApplication.php

+<?php
+
+namespace App\Entity;
+
+use App\Enum\CurrencyEnum;
+use App\Utils\OperationFactory;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Application du taux de cotisation lors du paiement d'une cotisation (au sens TAV).
+ * 
+ * Au paiement d'une cotisation:
+ *      - Un premier Flux est enregistré, correspondant à l'achat/vente d'emlc.
+ *      - Puis on applique le taux défini dans le ProfilDeCotisation de l'adhérent,
+ *        on crée un nouveau flux pour compléter la cositsation.
+ *
+ * @ORM\Entity
+ */
+class TauxCotisationApplication extends Flux
+{
+    const TYPE_REVERSEMENT_COTISATION_ADHERENT = 'reversement_cotisation_adherent';
+    const TYPE_PRELEVEMENT_COTISATION_ADHERENT = 'prelevement_cotisation_adherent';
+
+    /**
+     * @return string
+     */
+    public function getParenttype(): string
+    {
+        return parent::TYPE_APPLICATION_TAUX_COTISATION;
+    }
+
+    public function getAllOperations($em)
+    {
+        return [];
+    }
+
+    public function operate($em)
+    {
+        return [];
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return '';
+    }
+
+    public function getUsersToNotify()
+    {
+        return [];
+    }
+}

src/Entity/TauxCotisationPrelevement.php

+<?php
+
+namespace App\Entity;
+
+use App\Enum\CurrencyEnum;
+use App\Utils\OperationFactory;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * En cas de taux < 1, l'adhérent•e reçoit moins d'emlc que ce qu'elle•il paye en € :
+ * un second flux est créé pour prélever le complément de la cotisation.
+ *
+ * @ORM\Entity
+ */
+class TauxCotisationPrelevement extends TauxCotisationApplication
+{
+    /**
+     * @ORM\OneToOne(targetEntity="Adherent")
+     * @ORM\JoinColumn(name="adherent_id", referencedColumnName="id")
+     */
+    protected $expediteur;
+
+    /**
+     * @ORM\OneToOne(targetEntity="Siege")
+     * @ORM\JoinColumn(name="siege_id", referencedColumnName="id")
+     */
+    protected $destinataire;
+
+    public function getAllOperations($em)
+    {
+        return [
+            OperationFactory::getOperation($this, $this->getExpediteur(), CurrencyEnum::CURRENCY_EMLC, -$this->getMontant()),
+            OperationFactory::getOperation($this, $this->getDestinataire(), CurrencyEnum::CURRENCY_EMLC, -$this->getMontant()),  // Decrease siege ecompte too
+        ];
+    }
+
+    public function operate($em)
+    {
+        $this->getDestinataire()->removeEcompteNantie($this->getMontant());
+        $this->getExpediteur()->removeEcompte($this->getMontant());
+
+        return [$this->getExpediteur(), $this->getDestinataire()];
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return parent::TYPE_PRELEVEMENT_COTISATION_ADHERENT;
+    }
+
+    public function getUsersToNotify()
+    {
+        return [];
+    }
+}

src/Entity/TauxCotisationReversement.php

+<?php
+
+namespace App\Entity;
+
+use App\Enum\CurrencyEnum;
+use App\Utils\OperationFactory;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * En cas de taux > 1, l'adhérent•e reçoit plus d'emlc que ce qu'elle•il paye en € :
+ * un second flux est créé pour reverser le complément de la cotisation.
+ *
+ * @ORM\Entity
+ */
+class TauxCotisationReversement extends TauxCotisationApplication
+{
+    /**
+     * @ORM\OneToOne(targetEntity="Siege")
+     * @ORM\JoinColumn(name="siege_id", referencedColumnName="id")
+     */
+    protected $expediteur;
+
+    /**
+     * @ORM\OneToOne(targetEntity="Adherent")
+     * @ORM\JoinColumn(name="adherent_id", referencedColumnName="id")
+     */
+    protected $destinataire;
+
+    public function getAllOperations($em)
+    {
+        return [
+            OperationFactory::getOperation($this, $this->getExpediteur(), CurrencyEnum::CURRENCY_EMLC, $this->getMontant()), // Increase Siege ecompte
+            OperationFactory::getOperation($this, $this->getDestinataire(), CurrencyEnum::CURRENCY_EMLC, $this->getMontant()),
+        ];
+    }
+
+    public function operate($em)
+    {
+        $this->getExpediteur()->addEcompteNantie($this->getMontant());
+        $this->getDestinataire()->addEcompte($this->getMontant());
+
+        return [$this->getExpediteur(), $this->getDestinataire()];
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return parent::TYPE_REVERSEMENT_COTISATION_ADHERENT;
+    }
+
+    public function getUsersToNotify()
+    {
+        return [];
+    }
+}

src/Factory/FormFactory.php

@@ -51,6 +51,7 @@ use App\Form\Type\UserInfosFormType;
 use App\Form\Type\VenteEmlcAdherentFormType;
 use App\Form\Type\VenteEmlcPrestataireFormType;
 use App\Form\Type\SetPaymentCodeFormType;
+use App\Form\Type\EncaisserCotisationAdherentFormType;
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Form\Type\ChangePasswordFormType;
 use Symfony\Component\Form\FormFactoryInterface as FormF;
@@ -445,6 +446,19 @@ class FormFactory
         return $form->createView();
     }
 
+    public function getComptoirEncaisserCotisationForm(User $user)
+    {
+        if (empty($user) || empty($this->session->get('_comptoirgere'))) {
+            throw new \Exception('[FORM 26] Opération impossible !');
+        }
+        $entity = new AchatMonnaieAdherent();
+        $entity->setOperateur($user);
+
+        $form = $this->ff->create(EncaisserCotisationAdherentFormType::class, $entity, ['action' => $this->router->generate('comptoirEncaisserCotisation')]);
+
+        return $form->createView();
+    }
+
     public function getPayerCotisationTAVForm(User $user)
     {
         if (empty($user) || !$user->isGranted('ROLE_ADHERENT')) {
@@ -457,5 +471,4 @@ class FormFactory
 
         return $form->createView();
     }
-
 }

src/Form/Type/AchatMonnaieFormType.php

@@ -40,7 +40,7 @@ class AchatMonnaieFormType extends FluxFormType
             if (null != $profilDeCotisation) {
                 $montant = $profilDeCotisation->getMontant();
             } else {
-                $montant = intval($this->em->getRepository(GlobalParameter::class)->val(GlobalParameter::COTISATION_ADHERENT_DEFAULT));
+                $montant = false;
             }
 
             $builder

src/Form/Type/EncaisserCotisationAdherentFormType.php

+<?php
+
+namespace App\Form\Type;
+
+use App\Entity\Comptoir;
+use App\Entity\Adherent;
+use App\Entity\VenteEmlcComptoirAdherent;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class EncaisserCotisationAdherentFormType extends VenteEmlcAdherentFormType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        if (empty($this->security) || empty($this->security->getUser())) {
+            throw new \Exception('[FORM VENTE EMLC] Opération impossible !');
+        }
+
+        // Get the cotisation amount for each adherent. Used for display purposes on the front end.
+        $adherents = $this->em->getRepository(Adherent::class)->findOrderByName();
+        $adherentsProfiles = [];
+        foreach ($adherents as $adh) {
+            $montant = null;
+            if (!is_null($adh->getProfilDeCotisation()) ) {
+                $montant = $adh->getProfilDeCotisation()->getMontant();
+            }
+            $adherentsProfiles[strval($adh->getId())] = $montant;
+        }
+
+        $builder
+            ->add('reference', HiddenType::class, [
+                'data' => 'Encaissement cotisation adhérent'
+            ])
+            ->add('montant', HiddenType::class, [
+                'data' => 0  
+            ])
+            ->add('cotisationMontants', HiddenType::class, [
+                'data' =>  json_encode($adherentsProfiles),
+                'mapped' => false
+            ])
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'class' => VenteEmlcComptoirAdherent::class,
+        ]);
+    }
+
+    public function getParent()
+    {
+        return VenteEmlcAdherentFormType::class;
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'formEncaisserCotisationAdherent';
+    }
+}

src/Migrations/Version20221212100241.php

+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20221212100241 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE flux CHANGE parenttype parenttype VARCHAR(30) NOT NULL');
+        $this->addSql('ALTER TABLE prestataire CHANGE iban iban LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:personal_data)\'');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE flux CHANGE parenttype parenttype VARCHAR(20) CHARACTER SET utf8mb3 NOT NULL COLLATE `utf8mb3_general_ci`');
+        $this->addSql('ALTER TABLE prestataire CHANGE iban iban LONGTEXT CHARACTER SET utf8mb3 DEFAULT NULL COLLATE `utf8mb3_general_ci` COMMENT \'(DC2Type:personal_data)\'');
+    }
+}

src/Repository/FluxRepository.php

@@ -239,4 +239,29 @@ class FluxRepository extends ServiceEntityRepository
             ->getQuery()
             ->getSingleScalarResult();
     }
+
+    /**
+     * @param Adherent $adherent the user to look the cotisations for
+     * @param String $from, $to dates (ISO format) between wich to look for
+     * 
+     * @return Array list of cotisations between the dates
+     */
+    public function getTavCotisationsBetweenDates($adherent, $from, $to)
+    {
+        $sqlQuery = "SELECT f.id
+            FROM {$this->tableName} f
+            WHERE f.type IN ('achat_monnaie_adherent', 'vente_emlc_adherent')
+            AND f.created_at >= :f
+            AND f.created_at <= :t
+            AND (f.adherent_id = :adh_id OR f.adherent_dest_id = :adh_id)";
+        
+        $statement = $this->connection->prepare($sqlQuery);
+        $statement->bindValue(':f', $from);
+        $statement->bindValue(':t', $to);
+        $statement->bindValue(':adh_id', $adherent->getId());
+        $statement->execute();
+        $results = $statement->fetchAll();
+
+        return $results;
+    }
 }

src/Twig/FormExtension.php

@@ -53,7 +53,8 @@ class FormExtension extends AbstractExtension
             new \Twig_SimpleFunction('getTicketFixPrintForm', [$this, 'getTicketFixPrintForm']),
             new \Twig_SimpleFunction('getTicketFixDestroyForm', [$this, 'getTicketFixDestroyForm']),
             new \Twig_SimpleFunction('getSetPaymentCodeForm', [$this, 'getSetPaymentCodeForm']),
-            new \Twig_SimpleFunction('getPayerCotisationTAVForm', [$this, 'getPayerCotisationTAVForm']),
+            new \Twig_SimpleFunction('getComptoirEncaisserCotisationForm', [$this, 'getComptoirEncaisserCotisationForm']),
+            new \Twig_SimpleFunction('getPayerCotisationTAVForm', [$this, 'getPayerCotisationTAVForm'])
         ];
     }
 
@@ -207,6 +208,11 @@ class FormExtension extends AbstractExtension
         return $this->container->get('app.formfactory')->getSetPaymentCodeForm($user);
     }
 
+    public function getComptoirEncaisserCotisationForm(User $user)
+    {
+        return $this->container->get('app.formfactory')->getComptoirEncaisserCotisationForm($user);
+    }
+
     public function getPayerCotisationTAVForm(User $user)
     {
         return $this->container->get('app.formfactory')->getPayerCotisationTAVForm($user);

src/Utils/TAVCotisationUtils.php

+<?php
+
+namespace App\Utils;
+
+use App\Entity\Siege;
+use App\Entity\Flux;
+use App\Entity\TauxCotisationReversement;
+use App\Entity\TauxCotisationPrelevement;
+use App\Enum\MoyenEnum;
+use App\Utils\CustomEntityManager;
+use Symfony\Component\Security\Core\Security;
+
+class TAVCotisationUtils
+{
+    private $em;
+    private $security;
+    private $operationUtils;
+
+    public function __construct (
+        CustomEntityManager $em,
+        Security $security,
+        OperationUtils $operationUtils
+    ) {
+        $this->em = $em;
+        $this->security = $security;
+        $this->operationUtils = $operationUtils;
+    }
+
+    /**
+     * Check if cotisation already exist this month the the recipient of the given Flux.
+     */
+    public function checkExistingCotisation(Flux $flux) 
+    {
+        $first_day_this_month = date('Y-m-01');
+        $last_day_this_month  = date('Y-m-t');
+
+        $existing = $this->em->getRepository(Flux::class)->getTavCotisationsBetweenDates(
+            $flux->getDestinataire(),
+            $first_day_this_month,
+            $last_day_this_month
+        );
+
+        return count($existing) > 0;
+    }
+
+    /**
+     * Apply the cotisation profile rate to the amount paid 
+     * and register the complement as a new flux
+     * 
+     * Warning: EntityManager not flushed here.
+     */
+    public function applyTauxCotisation(Flux $flux)
+    {
+        // get the mlc amount the user will receive
+        $profile = $flux->getDestinataire()->getProfilDeCotisation();
+        $cotisationAmount = $profile->getMontant();
+        $cotisationTaux = $profile->getTauxCotisation();
+        $mlcAmount = $cotisationAmount * $cotisationTaux;
+
+        // get the difference between what the user paid and what he•she's supposed to receive
+        $amountDiff = $mlcAmount - $cotisationAmount;
+
+        if ($flux->getExpediteur() instanceof Siege) {
+            $siege = $flux->getExpediteur();
+        } else {
+            $siege = $flux->getExpediteur()->getGroupe()->getSiege();
+        }
+
+        if ($amountDiff > 0) {
+            // User should receive more than he•she paid: send a new flux to the user to complete its cotisation
+            $fluxCotis = new TauxCotisationReversement();
+            $fluxCotis->setExpediteur($siege);
+            $fluxCotis->setDestinataire($flux->getDestinataire());
+            $fluxCotis->setMontant($amountDiff);
+            $fluxCotis->setReference("Reversement cotisation après paiement de " . $cotisationAmount . "€ et application du taux " . $cotisationTaux);
+        } else {
+            // User should receive less than he•she paid: fetch the difference from his account 
+            $fluxCotis = new TauxCotisationPrelevement();
+            $fluxCotis->setExpediteur($flux->getDestinataire());
+            $fluxCotis->setDestinataire($siege);
+            $fluxCotis->setMontant(-$amountDiff);
+            $fluxCotis->setReference("Prélèvement cotisation après paiement de " . $cotisationAmount . "€ et application du taux " . $cotisationTaux);
+        }
+
+        $fluxCotis->setOperateur($this->security->getUser());
+        $fluxCotis->setRole($this->security->getUser()->getGroups()[0]->__toString());
+        $fluxCotis->setMoyen(MoyenEnum::MOYEN_EMLC);
+        $this->em->persist($fluxCotis);
+        $this->operationUtils->executeOperations($fluxCotis);
+    }
+}

templates/themes/kohinos/block/admin_comptoir.html.twig

@@ -12,9 +12,9 @@
 		{% include '@kohinos/comptoir/block/retrait_adherent.html.twig' %}
 		{% include '@kohinos/comptoir/block/reconversion.html.twig' %}
 		{% include '@kohinos/comptoir/block/reconversion_adherent.html.twig' %}
-	{% endif %}
-	{% include '@kohinos/comptoir/block/vente_emlc_adherent.html.twig' %}
-	{% if not tav_env %}
+		{% include '@kohinos/comptoir/block/vente_emlc_adherent.html.twig' %}
 		{% include '@kohinos/comptoir/block/vente_emlc_prestataire.html.twig' %}
+	{% else %}
+		{% include '@kohinos/tav/block/comptoir_encaisser_cotisation.html.twig' %}
 	{% endif %}
 {% endif %}
\ No newline at end of file

templates/themes/kohinos/tav/block/adherent_payer_cotisation.html.twig

@@ -6,22 +6,27 @@
 {% block blockcontent %}
     {% set form = getPayerCotisationTAVForm(app.user) %}
 
-    <p>
-        {{ 'Montant de la cotisation à payer'|trans }} : <span class="paiement_cotisation_montant">{{ form.montant.vars.value }} €</span>
-    </p>
+    {% if form.montant.vars.value == false %}
+        <p>{{ 'Vous n\'avez pas de profil de cotisation associé, vous ne pouvez donc pas payer de cotisation.'|trans }}</p>
+        <p>{{ 'Veuillez contacter un administrateur.'|trans }}</p>
+    {% else %}
+        <p>
+            {{ 'Montant de la cotisation à payer'|trans }} : <span class="paiement_cotisation_montant">{{ form.montant.vars.value }} €</span>
+        </p>
+        {{form_start(form)}}
+            {% if form.don is defined %}
+                {{ form_row(form.don, {row_attr:{style: 'max-width: 200px;margin: 0 auto;'}}) }}
+                <hr/>
+                <p><b>{{ 'TOTAL A PAYER'|trans }} : <span class="achat_monnaie_montant_total">{{ form.montant.vars.value }} €</span></b></p>
+            {% endif %}
+            {% if form.save is defined %}
+                {{ form_widget(form.save)  }}
+            {% endif %}
+            {% if form.saveHelloAsso is defined %}
+                {{ form_widget(form.saveHelloAsso)  }}
+            {% endif %}
+        {{form_end(form)}}
+    {% endif %}
 
-    {{form_start(form)}}
-        {% if form.don is defined %}
-            {{ form_row(form.don, {row_attr:{style: 'max-width: 200px;margin: 0 auto;'}}) }}
-            <hr/>
-			<p><b>{{ 'TOTAL A PAYER'|trans }} : <span class="achat_monnaie_montant_total">{{ form.montant.vars.value }} €</span></b></p>
-        {% endif %}
-        {% if form.save is defined %}
-            {{ form_widget(form.save)  }}
-        {% endif %}
-        {% if form.saveHelloAsso is defined %}
-            {{ form_widget(form.saveHelloAsso)  }}
-        {% endif %}
-    {{form_end(form)}}
 	
 {% endblock blockcontent %}
\ No newline at end of file

templates/themes/kohinos/tav/block/comptoir_encaisser_cotisation.html.twig

+{% extends '@kohinos/block/onetransaction.html.twig' %}
+
+{% block blocktitle %}
+	<i class="fa fa-exchange fa-exchange-alt mr-4"></i> {{ 'Encaisser la cotisation d\'un habitant'|trans }}
+{% endblock blocktitle %}
+{% block blockcontent %}
+	{% if app.session.has('_comptoirgere') %}
+		<div id="formEncaisserCotisationAdherent-montant-container" style="display:none">
+			<h5> <b>Montant de la cotisation : <span id="formEncaisserCotisationAdherent-montant-display"></span></b></h5>
+			<br/>
+		</div>
+		<div id="formEncaisserCotisationAdherent-no-profile" style="display:none">
+			<p class="formEncaisserCotisationAdherent-no-profile">
+				L'habitant•e n'a pas de profil de cotisation affecté, impossible de l'encaisser.
+			</p>
+		</div>
+		{% set form = getComptoirEncaisserCotisationForm(app.user) %}
+		{{ parent() }}
+	{% else %}
+		<span><em> {{ 'Aucun Comptoir assigné ! Veuillez contacter un administrateur !'|trans }} </em></span>
+	{% endif %}
+{% endblock blockcontent %}
\ No newline at end of file