CRM-38: Filter Out Payments not Done Within Recurring Contributions

civicrm · May 10, 2018 · f1eeafa · f1eeafa
1 parent 7621555
commit f1eeafa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/CRM/Member/Page/RecurringContributions.php b/CRM/Member/Page/RecurringContributions.php
@@ -56,6 +56,8 @@ private function loadRecurringContributions() {
   private function getRecurContributions($membershipID) {
     $result = civicrm_api3('MembershipPayment', 'get', array(
       'sequential' => 1,
+      'contribution_id.contribution_recur_id.id' => ['IS NOT NULL' => TRUE],
+      'options' => ['limit' => 0],
       'return' => array(
         'contribution_id.contribution_recur_id.id',
         'contribution_id.contribution_recur_id.contact_id',
@@ -78,10 +80,9 @@ private function getRecurContributions($membershipID) {
 
     foreach ($result['values'] as $payment) {
       $recurringContributionID = $payment['contribution_id.contribution_recur_id.id'];
-      $noRecurringContribution = empty($recurringContributionID);
-      $recurringAlreadyProcessed = isset($recurringContributions[$recurringContributionID]);
+      $alreadyProcessed = isset($recurringContributions[$recurringContributionID]);
 
-      if ($noRecurringContribution || $recurringAlreadyProcessed) {
+      if ($alreadyProcessed) {
         continue;
       }