Merge branch '5866-encaissement-calculate-amount-based-on-conventionnement' into 'ssa-gironde'

calculate encaissement max amount based on conventionnement

See merge request cooperatic/kohinos-tav!72

assets/css/app.css

@@ -405,3 +405,27 @@ form[name="formEncaissement"] label {
     text-align: right;
     font-style: italic;
 }
+
+.presta-conventionnement-applied-text {
+    margin-top: -0.75rem !important;
+    margin-bottom: 1rem;
+    font-size: 100%;
+}
+
+.montant-panier-error {
+    margin-top: -0.75rem !important;
+    margin-bottom: 1rem;
+    font-size: 100%;
+    color: #ff4136;
+}
+
+.input-error {
+    border-color: #ff4136 !important;
+}
+.input-error:focus {
+    box-shadow: 0 0 0 0.2rem #ff403667 !important;
+}
+
+.text-error {
+    color: #ff4136;
+}
\ No newline at end of file

assets/js/app.js

@@ -494,6 +494,88 @@ $(function() {
     // Set payment summary on validation page
     let recap = `${$("#formEncaissement_adherent option:selected").text()}, montant : ${$("#formEncaissement_montant").val()} ${KOH_MLC_NAME_SMALL}`;
     $(".payment-recap").text(recap);
+
+    // If conventionnement mode is active
+    if ($(this).find("#formEncaissement_montantPanier").length > 0) {
+      $("#formEncaissement_montant").prop("disabled",true);
+
+      let maxAmount = 0;
+
+      function disableMontant() {
+        $("#formEncaissement_montant").val("");
+        $("#formEncaissement_montant").prop("disabled", true);
+        $(".presta-conventionnement-applied-text").hide();
+      }
+
+      /**
+       * If basket amount is set and valid, enable emlc amount field & hide errors if needed.
+       * Else display errors.
+       */
+      function checkMontantPanier() {
+        let input = $("#formEncaissement_montantPanier");
+        let val = input.val();
+        if (val === '') {
+          // reset
+          $(".montant-panier-error").hide();
+          input.removeClass('input-error');
+
+          disableMontant();
+        } else {
+          let basketAmount = parseFloat(val);
+
+          if (isNaN(basketAmount)) {
+            // display error and reset the rest
+            $(".montant-panier-error").show();
+            input.addClass('input-error');
+
+            disableMontant();
+            return;
+          }
+
+          $(".montant-panier-error").hide();
+          input.removeClass('input-error');
+
+          // no error: enable amount field, set max emlc amount and display helper text
+          $("#formEncaissement_montant").prop("disabled", false);
+          $(".presta-conventionnement-applied-text").show();
+          
+          maxAmount = parseFloat(formEncaissementConventionnement) * basketAmount;
+          $(".encaissment-emlc-max-amount").text(maxAmount);
+        }
+
+        checkMaxAmount();
+      }
+
+      checkMontantPanier();
+      $("#formEncaissement_montantPanier").on("input", checkMontantPanier);
+
+      /**
+       * Check that emlc amount is valid depending on basket amount
+       */
+      function checkMaxAmount() {
+        function reset() {
+          $("#formEncaissement_montant").removeClass('input-error');
+          $(".encaissment-emlc-max-amount-container").removeClass("text-error");
+        }
+        
+        let val = $("#formEncaissement_montant").val();
+        if (val === '') {
+          reset();
+        } else {
+          let amount = parseFloat(val);
+          
+          if (!isNaN(amount) && amount > maxAmount) {
+            $(this).addClass('input-error');
+            $(".encaissment-emlc-max-amount-container").addClass("text-error");
+          } else if (!isNaN(amount) && amount <= maxAmount) {
+            reset();
+          }
+        }
+      }
+
+      checkMaxAmount();
+      $("#formEncaissement_montant").on("input", checkMaxAmount);
+    }
   }
 
   /**

public/build/entrypoints.json

@@ -3,10 +3,10 @@
     "app": {
       "js": [
         "/build/runtime.6ad5c9da.js",
-        "/build/app.a926d504.js"
+        "/build/app.6ea8ce63.js"
       ],
       "css": [
-        "/build/app.6350a995.css"
+        "/build/app.04bd0e32.css"
       ]
     },
     "admin": {

public/build/manifest.json

 {
-  "build/app.css": "/build/app.6350a995.css",
-  "build/app.js": "/build/app.a926d504.js",
+  "build/app.css": "/build/app.04bd0e32.css",
+  "build/app.js": "/build/app.6ea8ce63.js",
   "build/admin.css": "/build/admin.4de55830.css",
   "build/admin.js": "/build/admin.86a2d986.js",
   "build/runtime.js": "/build/runtime.6ad5c9da.js",

src/Controller/UserController.php

@@ -315,14 +315,33 @@ class UserController extends AbstractController
     }
 
     /**
+     * Payment terminal page.
+     * 
      * @Route("/encaissement", name="encaissement")
      * @IsGranted({"ROLE_CAISSIER", "ROLE_PRESTATAIRE"})
      */
     public function encaissementAction(Request $request)
     {
+        // If conventionnement process is activated, prevent access to payment terminal if prestataire conventionnement is not set
+        $conventionnementMode = $this->getParameter('presta_self_init_and_eval');
+        if ($conventionnementMode == true) {
+            $presta = $this->session->get('_prestagere');
+            $presta = $this->em->getRepository(Prestataire::class)->findOneById($presta->getId());
+
+            $conventionnement = $presta->getConventionnement();
+            if ($conventionnement == null || $conventionnement == 0) {
+                $this->addFlash(
+                    'error',
+                    $this->translator->trans("Impossible d'accéder au terminal de paiement tant que votre conventionnement n'a pas été établi par un·e gestionnaire.")
+                );
+
+                return $this->redirectToRoute('index');
+            }
+        }
+
         $form = $this->createForm(EncaissementFormType::class, null, []);
         $form->handleRequest($request);
-        $validation = false;
+        $validation = false;  // validation = user enters its code
         $insufficientBalance = null;  // if not null, will indicate for the template an insufficient founds situation 
 
         if ($form->isSubmitted()) {
@@ -331,34 +350,55 @@ class UserController extends AbstractController
             if ($form->isValid()) {
                 $adherent = $data["adherent"];
                 $adherent_code = $adherent->getPaymentCode();
+                $input_code = $data["payment_code"];
 
-                // if adherent account isn't enabled
-                if (!$adherent->getUser()->isEnabled()) {
-                    $this->addFlash(
-                        'error',
-                        $this->translator->trans('Le compte de l\'habitant·e est désactivé.')
-                    );
+                // Perform first step checks
+                if (empty($input_code)) {
+                    // if adherent account isn't enabled
+                    if (!$adherent->getUser()->isEnabled()) {
+                        $this->addFlash(
+                            'error',
+                            $this->translator->trans('Le compte de l\'habitant·e est désactivé.')
+                        );
 
-                    goto end;
-                }
+                        goto end;
+                    }
 
-                // if adherent doesn't have a validation code
-                if (is_null($adherent_code)) {
-                    $this->addFlash(
-                        'error',
-                        $this->translator->trans('L\'habitant·e n\'a pas encore défini un code de validation de paiement sur son espace personnel, il·elle ne peut pas payer en Monnaie Solidaire pour l\'instant.')
-                    );
+                    // if adherent doesn't have a validation code
+                    if (is_null($adherent_code)) {
+                        $this->addFlash(
+                            'error',
+                            $this->translator->trans('L\'habitant·e n\'a pas encore défini un code de validation de paiement sur son espace personnel, il·elle ne peut pas payer en Monnaie Solidaire pour l\'instant.')
+                        );
 
-                    goto end;
-                }
+                        goto end;
+                    }
 
-                $input_code = $data["payment_code"];
-                $validation = true;  // When the form is submitted & valid, and the user account checks passed, we enter the validation process
+                    // If entered amount is above maximum amount, depending on prestataire conventionnement
+                    if ($conventionnementMode == true) {
+                        $transaction_amount = floatval($data["montant"]);
+                        $montantPanier = floatval($form['montantPanier']->getData());
+                        $maxAmount = $montantPanier * floatval($conventionnement);
+
+                        if ($transaction_amount > $maxAmount) {
+                            $this->addFlash(
+                                'error',
+                                $this->translator->trans('Montant maximal en MonA dépassé. Veuillez modifier le montant en MonA.')
+                            );
+        
+                            goto end;
+                        }
+                    }
+
+                    // When the form is submitted & valid, and the user account checks passed, we enter the validation process
+                    $validation = true;
 
-                if (empty($input_code)) {
                     // First step validated (set user & amount) -> go to validation
                     goto end;
-                } 
+                } else {
+                    // We're in the validation process
+                    $validation = true;
+                }
 
                 // Check validation code
                 // NOTE as we use password salt, the user must change his payment code if his password changes
@@ -401,13 +441,15 @@ class UserController extends AbstractController
 
                     goto end;
                 }
-                
-                // Save transaction
+
+                // No error at this point: save transaction
                 $flux = new TransactionAdherentPrestataire();
                 $flux->setExpediteur($adherent);
 
-                $presta = $this->session->get('_prestagere');
-                $presta = $this->em->getRepository(Prestataire::class)->findOneById($presta->getId());
+                if (!isset($presta)) {
+                    $presta = $this->session->get('_prestagere');
+                    $presta = $this->em->getRepository(Prestataire::class)->findOneById($presta->getId());
+                }
                 $flux->setDestinataire($presta);
 
                 $flux->setOperateur($this->security->getUser());
@@ -421,7 +463,15 @@ class UserController extends AbstractController
                 $this->operationUtils->executeOperations($flux);
                 $this->em->flush();
 
-                return $this->redirectToRoute('encaissementSuccess');
+                $redirectParams = [];
+                if ($form->has('montantPanier')) {
+                    $transaction_amount = floatval($data["montant"]);
+                    $montantPanier = floatval($form['montantPanier']->getData());
+
+                    $redirectParams['remainingAmount'] = $montantPanier - $transaction_amount;
+                }
+
+                return $this->redirectToRoute('encaissementSuccess', $redirectParams);
             } else {
                 $this->addFlash(
                     'error',
@@ -431,11 +481,17 @@ class UserController extends AbstractController
         }
 
         end:
-        return $this->render('@kohinos/tav/encaissement_page.html.twig', [
+        $templateData = [
             'form' => $form->createView(),
             'validation' => $validation,
             'insufficientBalance' => $insufficientBalance
-        ]);
+        ];
+
+        if ($conventionnementMode == true) {
+            $templateData['conventionnement'] = $conventionnement;
+        }
+
+        return $this->render('@kohinos/tav/encaissement_page.html.twig', $templateData);
     }
 
     /**
@@ -444,6 +500,13 @@ class UserController extends AbstractController
      */
     public function encaissementSuccessAction(Request $request)
     {
-        return $this->render('@kohinos/tav/payment_done_page.html.twig', []);
+        $templateData = [];
+
+        $remainingAmount = $request->query->get('remainingAmount');
+        if ($remainingAmount != '') {
+            $templateData['remainingAmount'] = $remainingAmount;
+        }
+
+        return $this->render('@kohinos/tav/payment_done_page.html.twig', $templateData);
     }
 }

src/Form/Type/EncaissementFormType.php

@@ -10,23 +10,29 @@ use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use App\Entity\Adherent;
+use App\Entity\GlobalParameter;
 
 class EncaissementFormType extends AbstractType
 {
     protected $em;
     protected $security;
+    protected $container;
 
     public function __construct(
         EntityManagerInterface $em,
-        Security $security
+        Security $security,
+        ContainerInterface $container
     ) {
         $this->em = $em;
         $this->security = $security;
+        $this->container = $container;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        $mlcName = $this->em->getRepository(GlobalParameter::class)->val(GlobalParameter::MLC_NAME_SMALL);
         $builder
             ->add('adherent', EntityType::class, [
                 'class' => Adherent::class,
@@ -40,7 +46,7 @@ class EncaissementFormType extends AbstractType
                 'choice_label' => 'name'
             ])
             ->add('montant', NumberType::class, [
-                'label' => 'Montant : ',
+                'label' => "Montant à payer en {$mlcName} : ",
                 'required' => true,
                 'attr' => ['autocomplete' => 'off']
             ])
@@ -51,6 +57,20 @@ class EncaissementFormType extends AbstractType
             ])
             ->add('save', SubmitType::class, ['label' => 'Valider'])
         ;
+
+        if ($this->container->getParameter('presta_self_init_and_eval')) {
+            $builder
+                ->add('montantPanier', NumberType::class, [
+                    'label' => 'Montant total du panier : ',
+                    'required' => true,
+                    'attr' => ['autocomplete' => 'off'],
+                    'mapped' => false,
+                    'help' => ''
+                ])
+            ;
+        }
+
+
     }
 
     public function getBlockPrefix()

templates/themes/kohinos/tav/encaissement_page.html.twig

@@ -14,7 +14,7 @@
 			<b>{{ app.session.get('_prestagere') }}</b>
 		</div>
 
-		<h2 class='text-center w-100 mt-4 mb-4'>{{ "Paiement en MonA"|trans }}</h2>
+		<h2 class='text-center w-100 mt-4 mb-4'>{{ "Paiement"|trans }}</h2>
 	{% else %}
 		<div class="mt-3 payment-page-header">
 			<a href='{{ path('encaissement') }}'>
@@ -71,10 +71,27 @@
 				<div style="display:none;">
 					{{ form_row(form.adherent) }}
 					{{ form_row(form.montant) }}
+
+					{% if form.montantPanier is defined %}
+						{{ form_row(form.montantPanier) }}
+					{% endif %}
 				</div>
 			{% else %}
 				{{ form_row(form.adherent) }}
+
+				{% if form.montantPanier is defined %}
+					{{ form_row(form.montantPanier) }}
+					<div class="presta-conventionnement-applied-text form-text text-muted" style="display:none;">
+						Conventionnement du point de vente : {{ conventionnement * 100 }}% ; 
+						<span class="encaissment-emlc-max-amount-container">
+							le montant maximum payable en MonA est de : <span class="encaissment-emlc-max-amount"></span> MonA
+						</span>
+					</div>
+					<div class="montant-panier-error form-text" style="display:none;">La valeur est invalide.</div>
+				{% endif %}
+
 				{{ form_row(form.montant) }}
+
 				<br/>
 			{% endif %}
 			<br/>
@@ -86,6 +103,13 @@
 	var formEncaissementValidation = '{{ validation }}';
 	var KOH_MLC_NAME_SMALL = "{{ KOH_MLC_NAME_SMALL|default('') }}";
 </script>
+
+{% if conventionnement is defined %}
+	<script type="text/javascript">
+		var formEncaissementConventionnement = '{{ conventionnement }}';
+	</script>
+{% endif %}
+
 {% endblock %}
 
 {% block footer %}{% endblock footer %}
\ No newline at end of file

templates/themes/kohinos/tav/payment_done_page.html.twig

@@ -5,7 +5,9 @@
 {% block content %}
 <div class='container' style='max-width: 800px;'>
     <div class="payment-done-container">
-        <h1 class="text-center w-100 mt-4 payment-done-title">Paiement réussi !</h1>
+        <h1 class="text-center w-100 mt-4 payment-done-title">
+            {{ 'Paiement réussi !'|trans }}
+        </h1>
 
         <br/>
         
@@ -20,6 +22,12 @@
 
         <br/>
 
+        {% if remainingAmount is defined %}
+            <h5>{{ 'Reste à payer en euros :'|trans }} {{ remainingAmount }} €</h5>
+
+            <br/>
+        {% endif %}
+
         <a class='btn btn-xs btn-primary mt-4' href='{{ path('encaissement') }}'>
             {{ 'Nouvel  encaissement'|trans }}
         </a>