Merge branch 'develop'

assets/js/app.js

@@ -522,6 +522,18 @@ $(function() {
     $("#code-visual").text("*".repeat(code.length));
   });
 
+  if ($("form[name='formEncaissement'] #code-digits-container").length > 0)  {
+    document.addEventListener('keydown', function (e) {
+      if (!isNaN(parseInt(e.key))) {
+        $(`form[name='formEncaissement'] button.payment-code-button[data-value="${e.key}"]`)[0].click();
+      } else if (e.key === "Backspace") {
+        $("form[name='formEncaissement'] .payment-code-correction-button")[0].click();
+      } else if (e.key === "Enter") {
+        $("form[name='formEncaissement'] #formEncaissement_save")[0].click();
+      }
+    });
+  }
+
   $("#formEncaisserCotisationAdherent_destinataire").on("change", function() {
     const cotisationMontants = JSON.parse($("#formEncaisserCotisationAdherent_cotisationMontants").val());
     let cotisationmontant = cotisationMontants[this.value];

public/build/entrypoints.json

@@ -3,7 +3,7 @@
     "app": {
       "js": [
         "/build/runtime.6ad5c9da.js",
-        "/build/app.1a688d7d.js"
+        "/build/app.a8f5cd0d.js"
       ],
       "css": [
         "/build/app.9c351632.css"

public/build/manifest.json

 {
   "build/app.css": "/build/app.9c351632.css",
-  "build/app.js": "/build/app.1a688d7d.js",
+  "build/app.js": "/build/app.a8f5cd0d.js",
   "build/admin.css": "/build/admin.5dc0eea7.css",
   "build/admin.js": "/build/admin.cee4d78d.js",
   "build/runtime.js": "/build/runtime.6ad5c9da.js",

src/Exporter/CustomDoctrineORMQuerySourceIterator.php

@@ -66,15 +66,19 @@ class CustomDoctrineORMQuerySourceIterator extends AbstractPropertySourceIterato
             }
             $data['Gestionnaires'] = implode(' - ', $gestionnaires);
             $cotisEnd = $this->cotisationUtils->isCotisationValidForPresta($presta);
+            $cotisEnd = is_string($cotisEnd) ? new \DateTime( $cotisEnd ) : $cotisEnd;
             $data['Cotisation à jour'] = false == $cotisEnd ? '' : ($cotisEnd->format('d/m/Y'));
             $firstCotis = $this->cotisationUtils->getFirstCotisationForPresta($presta);
+            $firstCotis = is_string($firstCotis) ? new \DateTime( $firstCotis ) : $firstCotis;
             $data['Première Cotisation'] = false == $firstCotis ? '' : ($firstCotis->format('d/m/Y'));
         } elseif (!empty($data['Id']) && !empty($data['Email'])) {
             //adherent
             $adherent = $this->em->getRepository(Adherent::class)->findOneById($data['Id']);
             $cotisEnd = $this->cotisationUtils->isCotisationValidForAdherent($adherent);
+            $cotisEnd = is_string($cotisEnd) ? new \DateTime( $cotisEnd ) : $cotisEnd;
             $data['Cotisation à jour'] = false == $cotisEnd ? '' : ($cotisEnd->format('d/m/Y'));
             $firstCotis = $this->cotisationUtils->getFirstCotisationForAdherent($adherent);
+            $firstCotis = is_string($firstCotis) ? new \DateTime( $firstCotis ) : $firstCotis;
             $data['Première Cotisation'] = false == $firstCotis ? '' : ($firstCotis->format('d/m/Y'));
             $adminRoles = '';
             if (!empty($adherent->getUser())) {