fix payment with conventionnement errors & display remaining amount

assets/js/app.js

@@ -507,6 +507,10 @@ $(function() {
         $(".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();
@@ -538,12 +542,16 @@ $(function() {
           maxAmount = parseFloat(formEncaissementConventionnement) * basketAmount;
           $(".encaissment-emlc-max-amount").text(maxAmount);
         }
+
+        checkMaxAmount();
       }
-      checkMontantPanier();
 
-      // enable emlc amount field if basket amount is set and valid
+      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');

public/build/entrypoints.json

@@ -3,7 +3,7 @@
     "app": {
       "js": [
         "/build/runtime.6ad5c9da.js",
-        "/build/app.29f72415.js"
+        "/build/app.6ea8ce63.js"
       ],
       "css": [
         "/build/app.04bd0e32.css"

public/build/manifest.json

 {
   "build/app.css": "/build/app.04bd0e32.css",
-  "build/app.js": "/build/app.29f72415.js",
+  "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

@@ -269,7 +269,7 @@ class UserController extends AbstractController
 
         $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()) {
@@ -278,50 +278,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é.')
-                    );
-
-                    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.')
-                    );
-
-                    goto end;
-                }
+                // 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é.')
+                        );
 
-                // 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);
+                        goto end;
+                    }
 
-                    if ($transaction_amount > $maxAmount) {
+                    // if adherent doesn't have a validation code
+                    if (is_null($adherent_code)) {
                         $this->addFlash(
                             'error',
-                            $this->translator->trans('Montant maximal en MonA dépassé. Veuillez modifier le montant en MonA.')
+                            $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;
                     }
-                }
 
-                $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
@@ -365,7 +370,7 @@ class UserController extends AbstractController
                     goto end;
                 }
 
-                // Save transaction
+                // No error at this point: save transaction
                 $flux = new TransactionAdherentPrestataire();
                 $flux->setExpediteur($adherent);
 
@@ -386,7 +391,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',
@@ -415,6 +428,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

@@ -46,7 +46,7 @@ class EncaissementFormType extends AbstractType
                 'choice_label' => 'name'
             ])
             ->add('montant', NumberType::class, [
-                'label' => "Montant en {$mlcName} : ",
+                'label' => "Montant à payer en {$mlcName} : ",
                 'required' => true,
                 'attr' => ['autocomplete' => 'off']
             ])

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

@@ -71,6 +71,10 @@
 				<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) }}
@@ -98,8 +102,14 @@
 <script type="text/javascript">
 	var formEncaissementValidation = '{{ validation }}';
 	var KOH_MLC_NAME_SMALL = "{{ KOH_MLC_NAME_SMALL|default('') }}";
-	var formEncaissementConventionnement = '{{ conventionnement }}';
 </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>