Merge pull request #70 from andrew-cormick-dockery/fix/reduce-recurri…

…ng-job-fragility Reduce fragility of recurring payment processor upon internal error
ChrisChinchilla · Jun 9, 2023 · 93d55e7 · 93d55e7
2 parents 8af042a + e728b7f
commit 93d55e7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/CRM/Core/Payment/Ewayrecurring.php b/CRM/Core/Payment/Ewayrecurring.php
@@ -658,7 +658,12 @@ protected function processSinglePayment(&$params) {
 
     $eWAYRequest = $this->getEwayRequest($params);
     if ($this->getDummySuccessResult()) {
-      return $this->getDummySuccessResult();
+      if ($this->getAmountInCents($params) > 999) {
+        return $this->getDummySuccessResult();
+      }
+      else {
+        throw new PaymentProcessorException(' * Eway Developer Mode: simulated payment failure (amount less than $10)');
+      }
     }
     $eWAYResponse = new EwayRecurringGatewayResponse();
 

diff --git a/api/v3/Ewayrecurring/Payment.php b/api/v3/Ewayrecurring/Payment.php
@@ -17,9 +17,13 @@ function civicrm_api3_ewayrecurring_payment($params) {
     'group' => 'eway',
     'name' => 'eway_developer_mode',
   ))) {
-    return civicrm_api3_create_success(array(
-      $params['managed_customer_id'] => array('trxn_id' => uniqid()),
-    ), $params);
+    if ($params['amount_in_cents'] > 999) {
+      return civicrm_api3_create_success(array(
+        $params['managed_customer_id'] => array('trxn_id' => uniqid()),
+        ), $params);
+    } else {
+      throw new API_Exception(' * Eway Developer Mode: simulated payment failure (amount less than $10)');
+    }
   }
 
   $client = CRM_Core_Payment_EwayUtils::getClient($params['payment_processor_id']);

diff --git a/api/v3/Job/Eway.php b/api/v3/Job/Eway.php
@@ -56,7 +56,16 @@ function civicrm_api3_job_eway($params) {
 
   $apiResult[] = "Processing " . count($scheduled_contributions) . " scheduled contributions";
   foreach ($scheduled_contributions as $scheduled_contribution) {
-    $apiResult = array_merge($apiResult, _civicrm_api3_job_eway_process_contribution($scheduled_contribution));
+    try {
+      $apiResult = array_merge($apiResult, _civicrm_api3_job_eway_process_contribution($scheduled_contribution));
+    }
+    catch (CiviCRM_API3_Exception $e) {
+      $apiResult[] = "ERROR: failed to process payment for " .
+        $scheduled_contribution['type'] . " recurring contribution ID: " .
+        $scheduled_contribution['contribution']->contribution_recur_id;
+      $apiResult[] = 'Reason given: ' . $e->getMessage();
+      $apiResult[] = "Contribution was not attempted.";
+    }
   }
 
   return civicrm_api3_create_success($apiResult, $params);

diff --git a/info.xml b/info.xml
@@ -14,8 +14,8 @@
     <author>Melbourne CiviCRM</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2020-02-19</releaseDate>
-  <version>1.2.1</version>
+  <releaseDate>2023-03-02</releaseDate>
+  <version>2.4.1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.4</ver>