Damien Moulard · @DamienM · Yvon Kerdoncuff · Damien Moulard · Yvon Kerdoncuff · Damien Moulard
--- a/src/Entity/Payment.php
+++ b/src/Entity/Payment.php
        $now = new DateTime();
        if ($paymentEndDate && $paymentEndDate < $paymentEndDateDueToExpiry) {
            //Compare now with payment end date
-            $reason = "Paiement récurrent en cours jusqu'à dernière échéance le " . $paymentEndDate->format('d/m/Y') . ".";
+            $reason = "Paiement récurrent en cours de " . $this.recurrenceAmount() . "€ jusqu'à dernière échéance le " . $paymentEndDate->format('d/m/Y') . ".";
--- a/config/services.yaml
+++ b/config/services.yaml
    presta_extra_data: '%env(PRESTA_EXTRA_DATA)%'
    household_based_allowance: '%env(HOUSEHOLD_BASED_ALLOWANCE)%'
    ssa_friendly_flux_type_names: '%env(SSA_FRIENDLY_FLUX_TYPE_NAMES)%'
-    fix_balance_adherent_password: '%env(FIX_BALANCE_ADHERENT_PASSWORD)%'
+    extra_security_admin_password: '%env(EXTRA_SECURITY_ADMIN_PASSWORD)%'
--- a/src/Admin/AdherentAdmin.php
+++ b/src/Admin/AdherentAdmin.php
                            ->end()
                        ->end();
                }
+
+                if ($reason = $this->tavCotisationUtils->checkExistingRecurringPayment($adherent->getUser()->getEmail())) {
+                    $formMapper
+                        ->tab('General')
+                            ->with('Informations de cotisation')
+                                ->add('recurrentPaymentReason', HiddenType::class, [
+                                    'mapped' => false,
+                                    'data' => $reason,
+                                    'attr' => [
+                                        'class' => 'recurrentPaymentReason'
+                                    ]
+                                ])
+                                ->add('cancelRecurrentPaymentPassword', TextType::class, [
--- a/src/Admin/AdherentAdmin.php
+++ b/src/Admin/AdherentAdmin.php
                        $em->flush();
                    }
                }
+
+                // Cancel recurring payment
+                if(
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
 	}

 	if($(".fixBalanceAdherentFormPart").length > 0) {
-		$(".fixBalanceAdherentFormPart").parent().parent().hide();
-		$("div[id$='_idmlc']").append(
-			"<br/><input type='button' id='showFieldsToFixBalance' onclick='$(\".fixBalanceAdherentFormPart\").parent().parent().show();' value='Afficher les champs pour corriger le solde'> </input>"
+		if (!$(".fixBalanceAdherentFormPart").parent().parent().hasClass('has-error')) {
+			$(".fixBalanceAdherentFormPart").parent().parent().hide();
+		}
+		$(".fixBalanceAdherentFormPart").first().parent().parent().before(
+			"<div class='form-group'><input class='btn btn-primary' type='button' id='showFieldsToFixBalance' value='Afficher les champs pour corriger le solde'></input></div>"
+		);
+
+		$('#showFieldsToFixBalance').on('click', function (e) {