From fef9372267ab8aca6901f04013affbd93f3b478a Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 7 Jul 2022 17:22:57 +1200 Subject: [PATCH] Remove another instance of pledges using contribution option group --- CRM/Pledge/BAO/Pledge.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php index 7af5004ce5..112a3eefe5 100644 --- a/CRM/Pledge/BAO/Pledge.php +++ b/CRM/Pledge/BAO/Pledge.php @@ -780,14 +780,15 @@ GROUP BY currency $returnMessages = []; - $sendReminders = CRM_Utils_Array::value('send_reminders', $params, FALSE); + $sendReminders = $params['send_reminders'] ?? FALSE; - $allStatus = array_flip(CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name')); - $allPledgeStatus = CRM_Core_OptionGroup::values('pledge_status', - TRUE, FALSE, FALSE, NULL, 'name', TRUE - ); + $allStatus = array_flip(CRM_Pledge_BAO_PledgePayment::buildOptions('status_id', 'validate')); + // We are left with 'Pending' & 'Overdue' - ie. payment required - should we just filter in the ones we want? + unset($allStatus['Completed'], $allStatus['Cancelled']); + + $allPledgeStatus = array_flip(CRM_Pledge_BAO_Pledge::buildOptions('status_id', 'validate')); + // We are left with 'Pending' & 'Overdue', 'In Progress' unset($allPledgeStatus['Completed'], $allPledgeStatus['Cancelled']); - unset($allStatus['Completed'], $allStatus['Cancelled'], $allStatus['Failed']); $statusIds = implode(',', $allStatus); $pledgeStatusIds = implode(',', $allPledgeStatus); -- 2.25.1