From c2978fe0dc007daaf7bd43065eaa5e4df77fe152 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 11 Dec 2020 15:35:46 +1300
Subject: [PATCH] dev/financial#163 Comment all the places where removal of
contributionTypeID proposed
---
CRM/Contribute/BAO/ContributionPage.php | 1 -
CRM/Contribute/Form/Contribution.php | 1 -
CRM/Contribute/Form/Contribution/Confirm.php | 3 +--
CRM/Event/Form/Registration/Confirm.php | 2 --
CRM/Member/Form/Membership.php | 1 -
5 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/CRM/Contribute/BAO/ContributionPage.php b/CRM/Contribute/BAO/ContributionPage.php
index e5235acaea8..90e8ec6ef59 100644
--- a/CRM/Contribute/BAO/ContributionPage.php
+++ b/CRM/Contribute/BAO/ContributionPage.php
@@ -369,7 +369,6 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio
$values['financial_type_id']);
// Legacy support
$tplParams['contributionTypeName'] = $tplParams['financialTypeName'];
- $tplParams['contributionTypeId'] = $values['financial_type_id'];
}
if ($contributionPageId = CRM_Utils_Array::value('id', $values)) {
diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index 1fc9dc40639..54c6be46001 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1114,7 +1114,6 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
);
$paymentParams['contributionID'] = $contribution->id;
- $paymentParams['contributionTypeID'] = $contribution->financial_type_id;
$paymentParams['contributionPageID'] = $contribution->contribution_page_id;
$paymentParams['contributionRecurID'] = $contribution->contribution_recur_id;
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index fda165b2a03..45a59aa9cae 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -2558,8 +2558,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
// add some financial type details to the params list
// if folks need to use it
- //CRM-15297 deprecate contributionTypeID
- $paymentParams['financial_type_id'] = $paymentParams['financialTypeID'] = $paymentParams['contributionTypeID'] = $financialType->id;
+ $paymentParams['financial_type_id'] = $paymentParams['financialTypeID'] = $financialType->id;
//CRM-15297 - contributionType is obsolete - pass financial type as well so people can deprecate it
$paymentParams['financialType_name'] = $paymentParams['contributionType_name'] = $form->_params['contributionType_name'] = $financialType->name;
//CRM-11456
diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php
index 14afb06fe5b..d83cad562f7 100644
--- a/CRM/Event/Form/Registration/Confirm.php
+++ b/CRM/Event/Form/Registration/Confirm.php
@@ -563,11 +563,9 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration {
//passing contribution id is already registered.
$contribution = $this->processContribution($this, $value, $result, $contactID, $pending, $this->_paymentProcessor);
$value['contributionID'] = $contribution->id;
- $value['contributionTypeID'] = $contribution->financial_type_id;
$value['receive_date'] = $contribution->receive_date;
$value['trxn_id'] = $contribution->trxn_id;
$value['contributionID'] = $contribution->id;
- $value['contributionTypeID'] = $contribution->financial_type_id;
}
$value['contactID'] = $contactID;
$value['eventID'] = $this->_eventId;
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 3d6e1c8230f..2439dec25c6 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1339,7 +1339,6 @@ DESC limit 1");
$paymentParams['contactID'] = $this->_contactID;
$paymentParams['contributionID'] = $contribution->id;
- $paymentParams['contributionTypeID'] = $contribution->financial_type_id;
$paymentParams['contributionPageID'] = $contribution->contribution_page_id;
$paymentParams['contributionRecurID'] = $contribution->contribution_recur_id;
$params['contribution_id'] = $paymentParams['contributionID'];
--
GitLab