fixing #514

Project60 · Oct 31, 2018 · 0422674 · 0422674
1 parent ade3a31
commit 0422674
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/CRM/Sepa/Logic/Queue/Close.php b/CRM/Sepa/Logic/Queue/Close.php
@@ -279,8 +279,14 @@ protected function updateContributionStatus($contributions) {
       // this status cannot be set via the API -> use SQL
       CRM_Core_DAO::executeQuery("UPDATE civicrm_contribution SET contribution_status_id={$status_inProgress} WHERE id IN ({$contribution_id_list});");
 
-    } else {
-      // this should be status 'Completed', but it doesn't really matter
+    } else { // this should be status 'Completed', but it doesn't really matter
+      // first, some sanity checks:
+      if (version_compare(CRM_Utils_System::version(), '4.7.0', '>=')) {
+        // make sure they're all in status 'In Progress' to avoid SEPA-514
+        CRM_Core_DAO::executeQuery("UPDATE civicrm_contribution SET contribution_status_id={$status_inProgress} WHERE id IN ({$contribution_id_list});");
+      }
+
+      // then: set them all to the new status
       foreach ($contributions as $contribution) {
         civicrm_api3('Contribution', 'create', array(
             'id'                       => $contribution['id'],