Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#2716 [REF] Stop 'distributing' the main flow #20856

Merged
merged 1 commit into from
Sep 2, 2021
Merged

dev/core#2716 [REF] Stop 'distributing' the main flow #20856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 26 additions & 27 deletions CRM/Core/Payment/PayPalIPN.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@ public function retrieve($name, $type, $abort = TRUE) {
* @throws \CiviCRM_API3_Exception
*/
public function recur($input, $recur, $contribution, $first) {
if ($this->getTrxnType() === 'subscr_payment' &&
$input['paymentStatus'] !== 'Completed'
) {
Civi::log()->debug('PayPalIPN: Ignore all IPN payments that are not completed');
echo 'Failure: Invalid parameters<p>';
return;
}

// make sure the invoice ids match
// make sure the invoice is valid and matches what we have in the contribution record
Expand All @@ -102,51 +95,57 @@ public function recur($input, $recur, $contribution, $first) {
}
$recur->processor_id = $this->retrieve('subscr_id', 'String');
$recur->trxn_id = $recur->processor_id;
break;
$recur->save();
return;

case 'subscr_eot':
if ($recur->contribution_status_id != $contributionStatuses['Cancelled']) {
$recur->contribution_status_id = $contributionStatuses['Completed'];
}
$recur->end_date = $now;
break;
$recur->save();
return;

case 'subscr_cancel':
$recur->contribution_status_id = $contributionStatuses['Cancelled'];
$recur->cancel_date = $now;
break;
$recur->save();
return;

case 'subscr_failed':
$recur->contribution_status_id = $contributionStatuses['Failed'];
$recur->modified_date = $now;
$recur->save();
break;

case 'subscr_modify':
Civi::log()->debug('PayPalIPN: We do not handle modifications to subscriptions right now (RecurID: ' . $recur->id . ').');
echo "Failure: We do not handle modifications to subscriptions right now<p>";
return;

case 'subscr_payment':
if ($first) {
$recur->start_date = $now;
}
else {
$recur->modified_date = $now;
}

// 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;
}

$recur->save();

if ($this->getTrxnType() !== 'subscr_payment') {
return;
}
if ($input['paymentStatus'] !== 'Completed') {
Civi::log()->debug('PayPalIPN: Ignore all IPN payments that are not completed');
echo 'Failure: Invalid parameters<p>';
return;
}
if ($first) {
$recur->start_date = $now;
}
else {
$recur->modified_date = $now;
}

// 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'];
}
$recur->save();

if (!$first) {
// check if this contribution transaction is already processed
Expand All @@ -155,7 +154,7 @@ public function recur($input, $recur, $contribution, $first) {
$contribution->trxn_id = $input['trxn_id'];
if ($contribution->trxn_id && $contribution->find()) {
Civi::log()->debug('PayPalIPN: Returning since contribution has already been handled (trxn_id: ' . $contribution->trxn_id . ')');
echo "Success: Contribution has already been handled<p>";
echo 'Success: Contribution has already been handled<p>';
return;
}

Expand Down