From 0bd5e6bfbe8f339dbe066e3e96e00760c93a57e2 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 21 Oct 2020 13:25:29 +1300 Subject: [PATCH] dev/financial#152 move code only relevant to repeattransaction into that function Per https://github.com/civicrm/civicrm-core/pull/18814 I dug into this addRecurSoftCredits and it simply copies soft credits from the first transaction in the series to the new one. As such it belongs in repeattransaction not the main body of completeOrder --- CRM/Contribute/BAO/Contribution.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 7fa4c61049..e426ba7860 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -2665,6 +2665,8 @@ LEFT JOIN civicrm_contribution contribution ON ( componentPayment.contribution_ $contribution->id = $createContribution['id']; $contribution->copyCustomFields($templateContribution['id'], $contribution->id); self::handleMembershipIDOverride($contribution->id, $input); + // Add new soft credit against current $contribution. + CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($contributionParams['contribution_recur_id'], $createContribution['id']); return $createContribution; } } @@ -4453,11 +4455,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac $contributionResult = civicrm_api3('Contribution', 'create', $contributionParams); } - // Add new soft credit against current $contribution. - if ($recurringContributionID) { - CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($recurringContributionID, $contributionID); - } - $contribution->contribution_status_id = $contributionParams['contribution_status_id']; CRM_Core_Error::debug_log_message('Contribution record updated successfully'); -- 2.25.1