Move sending of email to recur function

diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php
index 99fcbe11096dca73eec370ab5777b1fbec791abb..8ac0a5d13ed75ce7dec018c793a7b968849bf0b0 100644 (file)
--- a/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -58,15 +58,7 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
       if ($contribution->contribution_status_id == 1) {
         $first = FALSE;
       }
-      $isFirstOrLastRecurringPayment = $this->recur($contributionRecur, $first);
-
-      if ($isFirstOrLastRecurringPayment) {
-        //send recurring Notification email for user
-        CRM_Contribute_BAO_ContributionPage::recurringNotify($contributionID, TRUE,
-          $contributionRecur
-        );
-      }
-
+      $this->recur($contributionRecur, $first);
       return TRUE;
     }
     catch (CRM_Core_Exception $e) {
@@ -79,7 +71,6 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
    * @param \CRM_Contribute_BAO_ContributionRecur $recur
    * @param bool $first
    *
-   * @return bool
    * @throws \CRM_Core_Exception
    */
   public function recur($recur, $first) {
@@ -123,11 +114,16 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN {
       // so we just fix the recurring contribution and not change any of
       // the existing contributions
       // CRM-9036
-      return FALSE;
+      return;
     }
 
     CRM_Contribute_BAO_Contribution::completeOrder($input, $recur->id, $first ? $this->getContributionID() : NULL);
-    return $isFirstOrLastRecurringPayment;
+    if ($isFirstOrLastRecurringPayment) {
+      //send recurring Notification email for user
+      CRM_Contribute_BAO_ContributionPage::recurringNotify($this->getContributionID(), TRUE,
+        $this->getContributionRecur()
+      );
+    }
   }
 
   /**