From c4055cec189af8809e8ad378489ee3ac9a422b29 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 11 Apr 2022 12:58:12 +1200 Subject: [PATCH] Paypal pro, a.net ipn - do not update start date, status Follows on from https://github.com/civicrm/civicrm-core/pull/23081 --- CRM/Core/Payment/AuthorizeNetIPN.php | 1 - CRM/Core/Payment/PayPalProIPN.php | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php index 939bd86836..21cd86e64a 100644 --- a/CRM/Core/Payment/AuthorizeNetIPN.php +++ b/CRM/Core/Payment/AuthorizeNetIPN.php @@ -121,7 +121,6 @@ class CRM_Core_Payment_AuthorizeNetIPN extends CRM_Core_Payment_BaseIPN { if ($input['response_code'] == 1) { // Approved if ($first) { - $recur->start_date = $now; $recur->trxn_id = $recur->processor_id; $isFirstOrLastRecurringPayment = CRM_Core_Payment::RECURRING_PAYMENT_START; } diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php index f8afbb1cd5..5ff6e0d317 100644 --- a/CRM/Core/Payment/PayPalProIPN.php +++ b/CRM/Core/Payment/PayPalProIPN.php @@ -288,10 +288,7 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { break; case 'recurring_payment': - if ($first) { - $recur->start_date = $now; - } - else { + if (!$first) { if ($input['paymentStatus'] !== 'Completed') { throw new CRM_Core_Exception("Ignore all IPN payments that are not completed"); } @@ -319,11 +316,6 @@ class CRM_Core_Payment_PayPalProIPN extends CRM_Core_Payment_BaseIPN { $subscriptionPaymentStatus = CRM_Core_Payment::RECURRING_PAYMENT_END; } - // make sure the contribution status is not done - // since order of ipn's is unknown - if ($recur->contribution_status_id != $contributionStatuses['Completed']) { - $recur->contribution_status_id = $contributionStatuses['In Progress']; - } break; } -- 2.25.1