From c16e82c3ead5190eba4784ac30ce7125ca4c7738 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 26 Aug 2022 11:30:56 +1200 Subject: [PATCH] Minor code styling fixes --- .../contributioncancelactions.php | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ext/contributioncancelactions/contributioncancelactions.php b/ext/contributioncancelactions/contributioncancelactions.php index 26fea16341..76e61d1756 100644 --- a/ext/contributioncancelactions/contributioncancelactions.php +++ b/ext/contributioncancelactions/contributioncancelactions.php @@ -1,9 +1,7 @@ contribution_status_id), - ['Cancelled', 'Failed'] - )) { - contributioncancelactions_cancel_related_pending_memberships((int) $objectId); - contributioncancelactions_cancel_related_pending_participant_records((int) $objectId); - } + if ($op === 'edit' && $objectName === 'Contribution' + && in_array(CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $objectRef->contribution_status_id), ['Cancelled', 'Failed'], TRUE) + ) { + contributioncancelactions_cancel_related_pending_memberships((int) $objectId); + contributioncancelactions_cancel_related_pending_participant_records((int) $objectId); } } @@ -37,9 +33,10 @@ function contributioncancelactions_civicrm_post($op, $objectName, $objectId, $ob * Find and cancel any pending participant records. * * @param int $contributionID + * * @throws CiviCRM_API3_Exception */ -function contributioncancelactions_cancel_related_pending_participant_records($contributionID): void { +function contributioncancelactions_cancel_related_pending_participant_records(int $contributionID): void { $pendingStatuses = CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Pending'"); $waitingStatuses = CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Waiting'"); $cancellableParticipantRecords = civicrm_api3('ParticipantPayment', 'get', [ @@ -59,10 +56,11 @@ function contributioncancelactions_cancel_related_pending_participant_records($c * Find and cancel any pending memberships. * * @param int $contributionID + * * @throws API_Exception * @throws CiviCRM_API3_Exception */ -function contributioncancelactions_cancel_related_pending_memberships($contributionID): void { +function contributioncancelactions_cancel_related_pending_memberships(int $contributionID): void { $connectedMemberships = (array) LineItem::get(FALSE)->setWhere([ ['contribution_id', '=', $contributionID], ['entity_table', '=', 'civicrm_membership'], -- 2.25.1