Merge branch '4111-evol-role-comptoir-des-habitants' into 'develop'

4111 evol role comptoir des habitants

See merge request cooperatic/kohinos-tav!2

src/Form/Type/VenteEmlcAdherentFormType.php

@@ -20,9 +20,9 @@ class VenteEmlcAdherentFormType extends VenteEmlcFormType
             ->add('destinataire', EntityType::class, [
                 'class' => Adherent::class,
                 'choices' => $this->em->getRepository(Adherent::class)->findOrderByName(),
-                'placeholder' => 'Adherent',
+                'placeholder' => $this->container->getParameter('tav_env') ? 'Habitant' : 'Adherent',
                 'required' => true,
-                'label' => 'Adherent :',
+                'label' => $this->container->getParameter('tav_env') ? 'Habitant :' : 'Adherent :',
             ])
             ->add('reference', HiddenType::class, [
                 'data' => 'Achat e' . $this->em->getRepository(GlobalParameter::class)->val(GlobalParameter::MLC_SYMBOL) . ' Adhérent',

src/Form/Type/VenteEmlcFormType.php

@@ -49,7 +49,7 @@ class VenteEmlcFormType extends FluxFormType
                 'entity_class' => Comptoir::class,
                 'em' => $this->em,
             ])
-            ->add('save', SubmitType::class, ['label' => 'Valider la vente de e-MLC'])
+            ->add('save', SubmitType::class, ['label' => $this->container->getParameter('tav_env') ? 'Valider' : 'Valider la vente de e-MLC'])
         ;
     }
 

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

@@ -5,12 +5,16 @@
 	{% include '@kohinos/comptoir/block/infos.html.twig' %}
 	{# {% include '@kohinos/block/transactions.html.twig' %} #}
 	{% include '@kohinos/block/operations.html.twig' %}
-	{% include '@kohinos/comptoir/block/vente_adherent.html.twig' %}
-	{% include '@kohinos/comptoir/block/vente_prestataire.html.twig' %}
-	{% include '@kohinos/comptoir/block/retrait_prestataire.html.twig' %}
-	{% include '@kohinos/comptoir/block/retrait_adherent.html.twig' %}
-	{% include '@kohinos/comptoir/block/reconversion.html.twig' %}
-	{% include '@kohinos/comptoir/block/reconversion_adherent.html.twig' %}
+	{% if not tav_env %}
+		{% include '@kohinos/comptoir/block/vente_adherent.html.twig' %}
+		{% include '@kohinos/comptoir/block/vente_prestataire.html.twig' %}
+		{% include '@kohinos/comptoir/block/retrait_prestataire.html.twig' %}
+		{% 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' %}
-	{% include '@kohinos/comptoir/block/vente_emlc_prestataire.html.twig' %}
+	{% if not tav_env %}
+		{% include '@kohinos/comptoir/block/vente_emlc_prestataire.html.twig' %}
+	{% endif %}
 {% endif %}
\ No newline at end of file

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

@@ -31,6 +31,9 @@
 		{% elseif app.user and is_granted('ROLE_COMPTOIR') %}
 
 			{% include '@kohinos/block/admin_comptoir.html.twig' %}
+			{% if tav_env %}
+				<a href='{{ path('adherent_create') }}' rel="noopener noreferrer" class='ml-2 text-center'><i class="fa fa-plus mr-2" aria-hidden="true"></i> Inscrire/modifier un habitant</a><br/><br/>
+			{% endif %}
 
 		{% elseif app.user and is_granted('ROLE_CONTACT') %}
 

templates/themes/kohinos/comptoir/block/vente_emlc_adherent.html.twig

 {% extends '@kohinos/block/onetransaction.html.twig' %}
 
 {% block blocktitle %}
-	<i class="fa fa-exchange fa-exchange-alt mr-4"></i> {{ 'Vente de monnaie numérique à un adhérent'|trans }}
+	<i class="fa fa-exchange fa-exchange-alt mr-4"></i> {% if tav_env %}{{ 'Encaisser la cotisation d\'un habitant'|trans }}{% else %}{{ 'Vente de monnaie numérique à un adhérent'|trans }}{% endif %}
 {% endblock blocktitle %}
 {% block blockcontent %}
 	{% if app.session.has('_comptoirgere') %}