Merge pull request #35 from vurt2/ng-error-event-payment-17

NG Processor: Throws error for event payment #17
Project60 · Nov 20, 2024 · 8a3595b · 8a3595b
2 parents 240dfee + 4d22095
commit 8a3595b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/CRM/Core/Payment/SDDNG.php b/CRM/Core/Payment/SDDNG.php
@@ -220,6 +220,11 @@ public static function getPendingContributionID()
         return null;
     }
 
+    public static function setPendingContributionID(int $contribution_id) {
+        self::$_pending_mandate['contribution_id'] = $contribution_id;
+        self::$_pending_mandate['contributionID'] = $contribution_id;
+    }
+
     public static function releasePendingMandateData($contribution_id)
     {
         if (!self::$_pending_mandate) {

diff --git a/sepapp.php b/sepapp.php
@@ -265,15 +265,25 @@ function sepapp_civicrm_postProcess($formName, &$form)
                 throw new Exception("Couldn't find PaymentProcessorType [{$pp_id}]");
             }
         }
-    } elseif ('CRM_Contribute_Form_Contribution_Confirm' == $formName) {
-        // post process the contributions created
-        CRM_Core_Payment_SDD::processPartialMandates();
-    } elseif ('CRM_Event_Form_Registration_Confirm' == $formName) {
+    } elseif ('CRM_Contribute_Form_Contribution_Confirm' == $formName || 'CRM_Event_Form_Registration_Confirm' == $formName) {
+        // SDD: make sure mandate is created:
+        CRM_Core_Payment_SDDNGPostProcessor::createPendingMandate();
+
         // post process the contributions created
         CRM_Core_Payment_SDD::processPartialMandates();
     }
 }
 
+/**
+ * Implements hook_civicrm_postSave_[table_name].
+ *
+ * We have to use this because comletetransaction apiWrapper does not work.
+ */
+function sepapp_civicrm_postSave_civicrm_contribution($dao) {
+    $contribution_id = $dao->id;
+    CRM_Core_Payment_SDDNG::setPendingContributionID($contribution_id);
+}
+
 /**
  * Will install the SEPA payment processor
  */