Skip to content

Commit

Permalink
Remove call to loadRelatedObjects from completetransaction
Browse files Browse the repository at this point in the history
  • Loading branch information
eileenmcnaughton committed Jul 31, 2022
1 parent 121b197 commit a12eb25
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions api/v3/Contribution.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
}
Expand All @@ -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);
}

Expand Down

0 comments on commit a12eb25

Please sign in to comment.