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

Jump to bottom

fix bug saving a new recurring contribution to the database #29005

Merged
merged 4 commits into from
Jan 16, 2024
Merged

fix bug saving a new recurring contribution to the database #29005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a35dbd6
fix bug saving a new recurring contribution to the database
patricklam Jan 14, 2024
56f5e59
use correct BAO to look up contribution_status_id
patricklam Jan 16, 2024
94a37ad
Add contributor
patricklam Jan 16, 2024
60fc7d3
Merge branch 'master' of github.com:patricklam/civicrm-core
patricklam Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CRM/Contribute/BAO/ContributionRecur.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,15 +940,15 @@ public static function updateOnNewPayment($recurringContributionID, $paymentStat

if ($paymentStatus == 'Completed'
&& CRM_Contribute_PseudoConstant::contributionStatus($existing['contribution_status_id'], 'name') == 'Pending') {
$params['contribution_status_id'] = 'In Progress';
$params['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionRecur', 'contribution_status_id', 'In Progress');
}
if ($paymentStatus == 'Failed') {
$params['failure_count'] = $existing['failure_count'];
}
$params['modified_date'] = date('Y-m-d H:i:s');

if (!empty($existing['installments']) && self::isComplete($recurringContributionID, $existing['installments'])) {
$params['contribution_status_id'] = 'Completed';
$params['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_ContributionRecur', 'contribution_status_id', 'Completed');
$params['next_sched_contribution_date'] = 'null';
$params['end_date'] = 'now';
}
Expand Down
4 changes: 4 additions & 0 deletions contributor-key.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,10 @@
- name : Patrick Corbett
organization: Redfin Solutions

- github : patricklam
name : Patrick Lam
organization: University of Waterloo

- name : Paul Barmak

- github : pbatroff
Expand Down