diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php index a8f20086aa67ac6b6dac2b5b69e679453b9a7b33..7128e8f17d2f78ae68efa66ab8e5d52809c88276 100644 --- a/CRM/Contribute/BAO/ContributionRecur.php +++ b/CRM/Contribute/BAO/ContributionRecur.php @@ -557,6 +557,7 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id ) * @param int $targetContributionId */ public static function copyCustomValues($recurId, $targetContributionId) { + CRM_Core_Error::deprecatedFunctionWarning('no alternative'); if ($recurId && $targetContributionId) { // get the initial contribution id of recur id $sourceContributionId = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution', $recurId, 'id', 'contribution_recur_id'); diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php index 614568b51889bbecade7c5dd2a84e7677f68ac86..7c33202a42f4ae3f5ec0d6b6c819d2d1069308d1 100644 --- a/CRM/Core/Payment/BaseIPN.php +++ b/CRM/Core/Payment/BaseIPN.php @@ -186,13 +186,6 @@ class CRM_Core_Payment_BaseIPN { CRM_Contribute_BAO_ContributionRecur::addRecurLineItems($objects['contributionRecur']->id, $contribution); } - //add new soft credit against current contribution id and - //copy initial contribution custom fields for recurring contributions - if (!empty($objects['contributionRecur']) && $objects['contributionRecur']->id) { - CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($objects['contributionRecur']->id, $contribution->id); - CRM_Contribute_BAO_ContributionRecur::copyCustomValues($objects['contributionRecur']->id, $contribution->id); - } - if (!empty($memberships)) { foreach ($memberships as $membership) { // @fixme Should we cancel only Pending memberships? per cancelled() @@ -264,13 +257,6 @@ class CRM_Core_Payment_BaseIPN { CRM_Contribute_BAO_ContributionRecur::addRecurLineItems($objects['contributionRecur']->id, $contribution); } - //add new soft credit against current $contribution and - //copy initial contribution custom fields for recurring contributions - if (!empty($objects['contributionRecur']) && $objects['contributionRecur']->id) { - CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($objects['contributionRecur']->id, $contribution->id); - CRM_Contribute_BAO_ContributionRecur::copyCustomValues($objects['contributionRecur']->id, $contribution->id); - } - if (!empty($memberships)) { foreach ($memberships as $membership) { if ($membership) {