[REF] Remove silly if
authoreileen <emcnaughton@wikimedia.org>
Mon, 2 Nov 2020 00:03:28 +0000 (13:03 +1300)
committereileen <emcnaughton@wikimedia.org>
Mon, 2 Nov 2020 02:06:53 +0000 (15:06 +1300)
Checking component AND contributionRecur is silly - the latter will only
be set if relevant so remove the extra if

CRM/Core/Payment/PayPalIPN.php

index 99a77d2aed6133040ce709edfca90385c4917f6e..360086b853e0c860d859288d17394920e1491d80 100644 (file)
@@ -328,18 +328,17 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN {
 
       $input['payment_processor_id'] = $paymentProcessorID;
 
-      if ($component == 'contribute') {
-        if ($ids['contributionRecur']) {
-          // check if first contribution is completed, else complete first contribution
-          $first = TRUE;
-          $completedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
-          if ($objects['contribution']->contribution_status_id == $completedStatusId) {
-            $first = FALSE;
-          }
-          $this->recur($input, $ids, $objects, $first);
-          return;
+      if (!empty($ids['contributionRecur'])) {
+        // check if first contribution is completed, else complete first contribution
+        $first = TRUE;
+        $completedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
+        if ($objects['contribution']->contribution_status_id == $completedStatusId) {
+          $first = FALSE;
         }
+        $this->recur($input, $ids, $objects, $first);
+        return;
       }
+
       $status = $input['paymentStatus'];
       if ($status === 'Denied' || $status === 'Failed' || $status === 'Voided') {
         $this->failed($objects);