X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=api%2Fv3%2FContribution.php;h=66dc25a66f06a8c8b05dcc27eccc7074958b6fde;hb=48b3a75e235826a3ff7dfa0ba34b3293fa1f624b;hp=16f1e20bb6198505b3c0f8a67335afe1edfc1b85;hpb=a30c801bdf595f8a00898941142b57773e097244;p=civicrm-core.git diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php index 16f1e20bb6..66f6cc0c93 100644 --- a/api/v3/Contribution.php +++ b/api/v3/Contribution.php @@ -356,7 +356,7 @@ function _civicrm_api3_contribution_get_spec(&$params) { $params['financial_type_id']['api.aliases'] = ['contribution_type_id']; $params['payment_instrument_id']['api.aliases'] = ['contribution_payment_instrument', 'payment_instrument']; - $params['contact_id'] = CRM_Utils_Array::value('contribution_contact_id', $params); + $params['contact_id'] = $params['contribution_contact_id'] ?? NULL; $params['contact_id']['api.aliases'] = ['contribution_contact_id']; $params['is_template']['api.default'] = 0; unset($params['contribution_contact_id']); @@ -640,6 +640,8 @@ function civicrm_api3_contribution_repeattransaction($params) { * @param CRM_Contribute_BAO_Contribution $firstContribution * * @return mixed + * @throws \CRM_Core_Exception + * @throws \CiviCRM_API3_Exception */ function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstContribution = NULL) { $objects = $contribution->_relatedObjects; @@ -670,11 +672,10 @@ function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstC $input['receipt_from_name'] = CRM_Utils_Array::value('receipt_from_name', $params, $domainFromName); $input['receipt_from_email'] = CRM_Utils_Array::value('receipt_from_email', $params, $domainFromEmail); } - $input['card_type_id'] = CRM_Utils_Array::value('card_type_id', $params); - $input['pan_truncation'] = CRM_Utils_Array::value('pan_truncation', $params); - $transaction = new CRM_Core_Transaction(); - return CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects, $transaction, - !empty($contribution->contribution_recur_id), $contribution, CRM_Utils_Array::value('is_post_payment_create', $params)); + $input['card_type_id'] = $params['card_type_id'] ?? NULL; + $input['pan_truncation'] = $params['pan_truncation'] ?? NULL; + return CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects, NULL, + $params['is_post_payment_create'] ?? NULL); } /**