Merge pull request civicrm#10986 from eileenmcnaughton/pp

CRM-20800 fix fatal error up updating paypal contributions
ixiam · Jan 10, 2018 · 8a06f16 · 8a06f16
2 parents 5d403ea + 11ff868
commit 8a06f16
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php
@@ -81,8 +81,10 @@ public function preProcess() {
 
     $this->contributionRecurID = CRM_Utils_Request::retrieve('crid', 'Integer', $this, FALSE);
     if ($this->contributionRecurID) {
-      $this->_paymentProcessor = CRM_Contribute_BAO_ContributionRecur::getPaymentProcessor($this->contributionRecurID);
-      if (!$this->_paymentProcessor) {
+      try {
+        $this->_paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getPaymentProcessorForRecurringContribution($this->contributionRecurID);
+      }
+      catch (CRM_Core_Exception $e) {
         CRM_Core_Error::statusBounce(ts('There is no valid processor for this subscription so it cannot be edited.'));
       }
       $this->_paymentProcessorObj = $this->_paymentProcessor['object'];

diff --git a/CRM/Financial/BAO/PaymentProcessor.php b/CRM/Financial/BAO/PaymentProcessor.php
@@ -508,6 +508,7 @@ public static function getProcessorForEntity($entityID, $component = 'contribute
      WHERE con.id = %1";
     }
     elseif ($component == 'recur') {
+      // @deprecated - use getPaymentProcessorForRecurringContribution.
       $sql = "
     SELECT cr.payment_processor_id as ppID1, NULL as ppID2, cr.is_test
       FROM civicrm_contribution_recur cr
@@ -549,4 +550,19 @@ public static function getProcessorForEntity($entityID, $component = 'contribute
     return $result;
   }
 
+  /**
+   * Get the payment processor associated with a recurring contribution series.
+   *
+   * @param int $contributionRecurID
+   *
+   * @return \CRM_Core_Payment
+   */
+  public static function getPaymentProcessorForRecurringContribution($contributionRecurID) {
+    $paymentProcessorId = civicrm_api3('ContributionRecur', 'getvalue', array(
+      'id' => $contributionRecurID,
+      'return' => 'payment_processor_id',
+    ));
+    return Civi\Payment\System::singleton()->getById($paymentProcessorId);
+  }
+
 }