Merge pull request #20316 from eileenmcnaughton/ppp

[REF] Switch to using getContributionRecurID function, remove now unused param
civicrm · May 17, 2021 · 72a1079 · 72a1079
2 parents a81d027 + 2d222eb
commit 72a1079
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
@@ -263,7 +263,7 @@ public function recur($input, $ids, $recur, $contribution, $first) {
           $input['contribution_status_id'] = $contributionStatuses['Completed'];
           $input['invoice_id'] = md5(uniqid(rand(), TRUE));
           $input['original_contribution_id'] = $ids['contribution'];
-          $input['contribution_recur_id'] = $ids['contributionRecur'];
+          $input['contribution_recur_id'] = $this->getContributionRecurID();
 
           civicrm_api3('Contribution', 'repeattransaction', $input);
           return;
@@ -307,15 +307,11 @@ public function recur($input, $ids, $recur, $contribution, $first) {
     // CRM-13737 - am not aware of any reason why payment_date would not be set - this if is a belt & braces
     $contribution->receive_date = !empty($input['payment_date']) ? date('YmdHis', strtotime($input['payment_date'])) : $now;
 
-    $this->single($input, [
-      'participant' => $ids['participant'] ?? NULL,
-      'contributionRecur' => $recur->id ?? NULL,
-    ], $contribution, TRUE, $first);
+    $this->single($input, $contribution, TRUE, $first);
   }
 
   /**
    * @param array $input
-   * @param array $ids
    * @param \CRM_Contribute_BAO_Contribution $contribution
    * @param bool $recur
    * @param bool $first
@@ -326,7 +322,7 @@ public function recur($input, $ids, $recur, $contribution, $first) {
    * @throws \CiviCRM_API3_Exception
    * @throws \Civi\API\Exception\UnauthorizedException
    */
-  public function single($input, $ids, $contribution, $recur = FALSE, $first = FALSE) {
+  public function single($input, $contribution, $recur = FALSE, $first = FALSE) {
 
     // make sure the invoice is valid and matches what we have in the contribution record
     if ((!$recur) || ($recur && $first)) {
@@ -385,7 +381,7 @@ public function single($input, $ids, $contribution, $recur = FALSE, $first = FAL
       return;
     }
 
-    CRM_Contribute_BAO_Contribution::completeOrder($input, $ids['contributionRecur'] ?? NULL, $contribution->id ?? NULL);
+    CRM_Contribute_BAO_Contribution::completeOrder($input, $this->getContributionRecurID(), $contribution->id ?? NULL);
   }
 
   /**
@@ -454,7 +450,7 @@ public function main() {
         $ids['onbehalf_dupe_alert'] = self::retrieve('onBehalfDupeAlert', 'Integer', 'GET', FALSE);
       }
 
-      if (!$ids['membership'] && $ids['contributionRecur']) {
+      if (!$ids['membership'] && $this->getContributionRecurID()) {
         $sql = "
     SELECT m.id
       FROM civicrm_membership m
@@ -463,7 +459,7 @@ public function main() {
      LIMIT 1";
         $sqlParams = [
           1 => [$ids['contribution'], 'Integer'],
-          2 => [$ids['contributionRecur'], 'Integer'],
+          2 => [$this->getContributionRecurID(), 'Integer'],
         ];
         if ($membershipId = CRM_Core_DAO::singleValueQuery($sql, $sqlParams)) {
           $ids['membership'] = $membershipId;
@@ -519,10 +515,7 @@ public function main() {
         return;
       }
 
-      $this->single($input, [
-        'participant' => $ids['participant'] ?? NULL,
-        'contributionRecur' => $ids['contributionRecur'] ?? NULL,
-      ], $contribution, FALSE, FALSE);
+      $this->single($input, $contribution, FALSE, FALSE);
     }
     catch (CRM_Core_Exception $e) {
       Civi::log()->debug($e->getMessage() . ' input {input}', ['input' => $input]);