From 2594dafde67b3875ab48fb08674a1919b048a216 Mon Sep 17 00:00:00 2001
From: Johan Cwiklinski <johan@x-tnd.be>
Date: Wed, 7 Oct 2020 04:27:19 +0200
Subject: [PATCH] Contribution email was not sent to member

---
 .../Controllers/Crud/ContributionsController.php       | 10 +++++-----
 galette/lib/Galette/Events/ContribListener.php         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/galette/lib/Galette/Controllers/Crud/ContributionsController.php b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
index 5b82ba629..32b96d9dd 100644
--- a/galette/lib/Galette/Controllers/Crud/ContributionsController.php
+++ b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
@@ -571,6 +571,11 @@ class ContributionsController extends CrudController
             }
 
             if (count($error_detected) == 0) {
+                // send email to member
+                if (isset($post['mail_confirm']) && $post['mail_confirm'] == '1') {
+                    $contrib->setSendmail(); //flag to send creation email
+                }
+
                 $store = $contrib->store();
                 if ($store === true) {
                     $this->flash->addMessage(
@@ -585,11 +590,6 @@ class ContributionsController extends CrudController
         }
 
         if (count($error_detected) == 0) {
-            // send email to member
-            if (isset($post['mail_confirm']) && $post['mail_confirm'] == '1') {
-                $contrib->setSendmail(); //flag to send creation email
-            }
-
             $this->session->contribution = null;
             if ($contrib->isTransactionPart() && $contrib->transaction->getMissingAmount() > 0) {
                 //new contribution
diff --git a/galette/lib/Galette/Events/ContribListener.php b/galette/lib/Galette/Events/ContribListener.php
index f609251e6..a614a598e 100644
--- a/galette/lib/Galette/Events/ContribListener.php
+++ b/galette/lib/Galette/Events/ContribListener.php
@@ -192,12 +192,12 @@ class ContribListener implements ListenerProviderInterface
     /**
      * Send account email to member
      *
-     * @param Adherent $member Member
-     * @param boolean  $new    New member or editing existing one
+     * @param Contribution $contrib Contribution
+     * @param boolean      $new     New contribution or editing existing one
      *
      * @return void
      */
-    private function sendContribEmail(Adherent $member, $new)
+    private function sendContribEmail(Contribution $contrib, $new)
     {
         if ($this->preferences->pref_mail_method == GaletteMail::METHOD_DISABLED) {
             //if email has been disabled in the preferences, we should not be here ;
-- 
2.39.2