From 6067e16b06c6da57700905de22bb8861659785a7 Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 6 Sep 2020 10:59:14 +1200 Subject: [PATCH] Finish deprecating BaseIPN->completeTransaction This has been marked deprecated, but still called for a long timme. Now that it is just a one-liner I think it's cleaner if the core processors that use it do the one line directly --- CRM/Core/Payment/AuthorizeNetIPN.php | 6 +++++- CRM/Core/Payment/BaseIPN.php | 1 + CRM/Core/Payment/PayPalIPN.php | 6 +++++- CRM/Core/Payment/PayPalProIPN.php | 6 +++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php index 83697bd338..ca4de65353 100644 --- a/CRM/Core/Payment/AuthorizeNetIPN.php +++ b/CRM/Core/Payment/AuthorizeNetIPN.php @@ -182,7 +182,11 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN { return TRUE; } - $this->completeTransaction($input, $ids, $objects); + CRM_Contribute_BAO_Contribution::completeOrder($input, [ + 'related_contact' => $ids['related_contact'] ?? NULL, + 'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL, + 'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL, + ], $objects); // Only Authorize.net does this so it is on the a.net class. If there is a need for other processors // to do this we should make it available via the api, e.g as a parameter, changing the nuance diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php index d99c8c8f80..518e35a2d2 100644 --- a/CRM/Core/Payment/BaseIPN.php +++ b/CRM/Core/Payment/BaseIPN.php @@ -461,6 +461,7 @@ class CRM_Core_Payment_BaseIPN { * @throws \CiviCRM_API3_Exception */ public function completeTransaction($input, $ids, $objects) { + CRM_Core_Error::deprecatedFunctionWarning('Use Payment.create api'); CRM_Contribute_BAO_Contribution::completeOrder($input, [ 'related_contact' => $ids['related_contact'] ?? NULL, 'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL, diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php index 289bdcd745..830f085a07 100644 --- a/CRM/Core/Payment/PayPalIPN.php +++ b/CRM/Core/Payment/PayPalIPN.php @@ -276,7 +276,11 @@ class CRM_Core_Payment_PayPalIPN extends CRM_Core_Payment_BaseIPN { return; } - $this->completeTransaction($input, $ids, $objects); + CRM_Contribute_BAO_Contribution::completeOrder($input, [ + 'related_contact' => $ids['related_contact'] ?? NULL, + 'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL, + 'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL, + ], $objects); } /** diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php index 024d845b42..a0f418eeee 100644 --- a/CRM/Core/Payment/PayPalProIPN.php +++ b/CRM/Core/Payment/PayPalProIPN.php @@ -373,7 +373,11 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { return; } - $this->completeTransaction($input, $ids, $objects); + CRM_Contribute_BAO_Contribution::completeOrder($input, [ + 'related_contact' => $ids['related_contact'] ?? NULL, + 'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL, + 'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL, + ], $objects); } /** -- 2.25.1