From 3fe06aa5f4d98f720c452c6e5de07b955b19221b Mon Sep 17 00:00:00 2001 From: eileen Date: Sat, 2 Nov 2019 17:16:33 +1300 Subject: [PATCH] Revert places where setters are used to set things These are all new in 5.20 & if we are going to change we should reverse & re-do before cutting 5.20 --- CRM/Contribute/Form/CancelSubscription.php | 1 - api/v3/PaymentProcessor.php | 9 --------- 2 files changed, 10 deletions(-) diff --git a/CRM/Contribute/Form/CancelSubscription.php b/CRM/Contribute/Form/CancelSubscription.php index 75ae5a1c05..ef9dbe32ca 100644 --- a/CRM/Contribute/Form/CancelSubscription.php +++ b/CRM/Contribute/Form/CancelSubscription.php @@ -220,7 +220,6 @@ class CRM_Contribute_Form_CancelSubscription extends CRM_Contribute_Form_Contrib if (CRM_Utils_Array::value('send_cancel_request', $params) == 1) { $cancelParams = ['subscriptionId' => $this->_subscriptionDetails->subscription_id]; - $this->_paymentProcessorObj->setContributionRecurID($this->contributionRecurID); $cancelSubscription = $this->_paymentProcessorObj->cancelSubscription($message, $cancelParams); } diff --git a/api/v3/PaymentProcessor.php b/api/v3/PaymentProcessor.php index 8373cc7ec7..a414717970 100644 --- a/api/v3/PaymentProcessor.php +++ b/api/v3/PaymentProcessor.php @@ -131,15 +131,6 @@ function civicrm_api3_payment_processor_pay($params) { $processor = Civi\Payment\System::singleton()->getById($params['payment_processor_id']); $processor->setPaymentProcessor(civicrm_api3('PaymentProcessor', 'getsingle', ['id' => $params['payment_processor_id']])); try { - $processor->setContributionID($params['contribution_id']); - $processor->setInvoiceID($params['invoice_id'] ?? ''); - if (!empty($params['contact_id'])) { - $processor->setContactID((int) $params['contact_id']); - } - if (!empty($params['contribution_recur_id'])) { - $processor->setContributionRecurID((int) $params['contribution_recur_id']); - } - $result = $processor->doPayment($params); } catch (\Civi\Payment\Exception\PaymentProcessorException $e) { -- 2.25.1