From 67fd9f755c1ae14f52385534ea0baf881d05e07e Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 29 Jul 2022 10:31:59 +0100 Subject: [PATCH] Remove call to loadRelatedObjects from completetransaction --- api/v3/Contribution.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php index 6154d6343b..83f8b91064 100644 --- a/api/v3/Contribution.php +++ b/api/v3/Contribution.php @@ -495,18 +495,6 @@ function civicrm_api3_contribution_completetransaction($params) { ]; $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL)); - $ids = []; - if (!$contribution->loadRelatedObjects(['payment_processor_id' => $input['payment_processor_id'] ?? NULL], $ids, TRUE)) { - throw new API_Exception('failed to load related objects'); - } - - // @todo Copied from _ipn_process_transaction - needs cleanup/refactor - $objects = $contribution->_relatedObjects; - $objects['contribution'] = &$contribution; - $input['component'] = $contribution->_component; - $input['is_test'] = $contribution->is_test; - $input['amount'] = empty($input['total_amount']) ? $contribution->total_amount : $input['total_amount']; - if (isset($params['is_email_receipt'])) { $input['is_email_receipt'] = $params['is_email_receipt']; } @@ -529,8 +517,8 @@ function civicrm_api3_contribution_completetransaction($params) { $input['payment_instrument_id'] = $params['payment_instrument_id']; } return CRM_Contribute_BAO_Contribution::completeOrder($input, - !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL, - $objects['contribution']->id ?? NULL, + $contribution->contribution_recur_id, + $params['id'], $params['is_post_payment_create'] ?? NULL); } -- 2.25.1