From a5e7aa3601d5dfba1ee946144ea7f1e9f686e378 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 11 Apr 2022 13:33:26 +1200 Subject: [PATCH] [REF] Extract getContributionRecurID --- CRM/Core/Payment/AuthorizeNetIPN.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php index 939bd86836..558a32e121 100644 --- a/CRM/Core/Payment/AuthorizeNetIPN.php +++ b/CRM/Core/Payment/AuthorizeNetIPN.php @@ -52,7 +52,7 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN { $this->getInput($input); // load post ids in $ids - $this->getIDs($ids, $input); + $this->getIDs($ids); $paymentProcessorID = $this->getPaymentProcessorID(); // Check if the contribution exists @@ -205,14 +205,12 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN { * Get ids from input. * * @param array $ids - * @param array $input * * @throws \CRM_Core_Exception */ - public function getIDs(&$ids, $input) { + public function getIDs(&$ids) { $ids['contribution'] = $this->getContributionID(); - $contributionRecur = $this->getContributionRecurObject($this->getRecurProcessorID(), (int) $this->retrieve('x_cust_id', 'Integer', FALSE, 0), $this->getContributionID()); - $ids['contributionRecur'] = (int) $contributionRecur->id; + $ids['contributionRecur'] = $this->getContributionRecurID(); } /** @@ -350,4 +348,15 @@ INNER JOIN civicrm_contribution co ON co.contribution_recur_id = cr.id return (int) $this->retrieve('x_invoice_num', 'Integer'); } + /** + * Get the id of the recurring contribution. + * + * @return int + * @throws \CRM_Core_Exception + */ + protected function getContributionRecurID(): int { + $contributionRecur = $this->getContributionRecurObject($this->getRecurProcessorID(), (int) $this->retrieve('x_cust_id', 'Integer', FALSE, 0), $this->getContributionID()); + return (int) $contributionRecur->id; + } + } -- 2.25.1