From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Sun, 3 May 2015 03:28:16 +0000 (+1200)
Subject: CRM-16367 (Contribution form refactor) rename contribution type to financial type
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=67256e0c7ff7ad286803d1405deb974c5ea4f596;p=civicrm-core.git

CRM-16367 (Contribution form refactor) rename contribution type to financial type
---

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index edd3ce2d90..c575b6832a 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -1149,12 +1149,12 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     $paymentParams['contactID'] = $this->_contactID;
     CRM_Core_Payment_Form::mapParams($this->_bltID, $this->_params, $paymentParams, TRUE);
 
-    $contributionType = new CRM_Financial_DAO_FinancialType();
-    $contributionType->id = $params['financial_type_id'];
+    $financialType = new CRM_Financial_DAO_FinancialType();
+    $financialType->id = $params['financial_type_id'];
 
     // Add some financial type details to the params list
     // if folks need to use it.
-    $paymentParams['contributionType_name'] = $this->_params['contributionType_name'] = $contributionType->name;
+    $paymentParams['contributionType_name'] = $this->_params['contributionType_name'] = $financialType->name;
     $paymentParams['contributionPageID'] = NULL;
 
     if (!empty($this->_params['is_email_receipt'])) {
@@ -1178,7 +1178,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
         $this->_params,
         NULL,
         $this->_contactID,
-        $contributionType,
+        $financialType,
         TRUE,
         FALSE,
         $isTest,
@@ -1230,7 +1230,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
 
     // Result has all the stuff we need
     // lets archive it to a financial transaction
-    if ($contributionType->is_deductible) {
+    if ($financialType->is_deductible) {
       $this->assign('is_deductible', TRUE);
       $this->set('is_deductible', TRUE);
     }
@@ -1261,7 +1261,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
         $this->_params,
         $result,
         $this->_contactID,
-        $contributionType,
+        $financialType,
         FALSE, FALSE,
         $isTest,
         $this->_lineItem