From: Pratik Joshi <pratik.joshi@webaccess.co.in>
Date: Mon, 15 Apr 2013 07:12:14 +0000 (+0530)
Subject: CRM-12344 fix : this commit fixes the issue mentioned in description as well as ... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6d3864ef5d15a5f4e8d346062f05d20cd29fc633;p=civicrm-core.git

CRM-12344 fix : this commit fixes the issue mentioned in description as well as 'pledge for' field valur missing on user dashboard page
---

diff --git a/CRM/Pledge/Selector/Search.php b/CRM/Pledge/Selector/Search.php
index 4b13d0200b..1f72e15e79 100644
--- a/CRM/Pledge/Selector/Search.php
+++ b/CRM/Pledge/Selector/Search.php
@@ -77,7 +77,7 @@ class CRM_Pledge_Selector_Search extends CRM_Core_Selector_Base {
     'pledge_status',
     'pledge_is_test',
     'pledge_contribution_page_id',
-    'pledge_contribution_type',
+    'pledge_financial_type',
     'pledge_campaign_id',
     'pledge_currency',
   );
@@ -400,7 +400,7 @@ class CRM_Pledge_Selector_Search extends CRM_Core_Selector_Base {
         ),
         array(
           'name' => ts('Pledged For'),
-          'sort' => 'pledge_contribution_type',
+          'sort' => 'pledge_financial_type',
           'direction' => CRM_Utils_Sort::DONTCARE,
         ),
         array(
diff --git a/templates/CRM/Pledge/Form/Selector.tpl b/templates/CRM/Pledge/Form/Selector.tpl
index a875b6eec4..a2e1e7a394 100644
--- a/templates/CRM/Pledge/Form/Selector.tpl
+++ b/templates/CRM/Pledge/Form/Selector.tpl
@@ -79,7 +79,7 @@
             <td class="right">{$row.pledge_amount|crmMoney:$row.pledge_currency}</td>
             <td class="right">{$row.pledge_total_paid|crmMoney:$row.pledge_currency}</td>
             <td class="right">{$row.pledge_amount-$row.pledge_total_paid|crmMoney:$row.pledge_currency}</td>
-            <td>{$row.pledge_contribution_type}</td>
+            <td>{$row.pledge_financial_type}</td>
             <td>{$row.pledge_create_date|truncate:10:''|crmDate}</td>
             <td>{$row.pledge_next_pay_date|truncate:10:''|crmDate}</td>
             <td class="right">{$row.pledge_next_pay_amount|crmMoney:$row.pledge_currency}</td>
diff --git a/templates/CRM/Pledge/Page/UserDashboard.tpl b/templates/CRM/Pledge/Page/UserDashboard.tpl
index 669fd40d10..3ff34a2890 100644
--- a/templates/CRM/Pledge/Page/UserDashboard.tpl
+++ b/templates/CRM/Pledge/Page/UserDashboard.tpl
@@ -39,7 +39,7 @@
     <td class="crm-pledge-pledge_amount">{$row.pledge_amount|crmMoney:$row.pledge_currency}</td>
     <td class="crm-pledge-pledge_total_paid">{$row.pledge_total_paid|crmMoney:$row.pledge_currency}</td>
     <td class="crm-pledge-pledge_amount">{$row.pledge_amount-$row.pledge_total_paid|crmMoney:$row.pledge_currency}</td>
-    <td class="crm-pledge-pledge_contribution_type">{$row.pledge_contribution_type}</td>
+    <td class="crm-pledge-pledge_contribution_type">{$row.pledge_financial_type}</td>
     <td class="crm-pledge-pledge_create_date">{$row.pledge_create_date|truncate:10:''|crmDate}</td>
     <td class="crm-pledge-pledge_next_pay_date">{$row.pledge_next_pay_date|truncate:10:''|crmDate}</td>
     <td class="crm-pledge-pledge_next_pay_amount">{$row.pledge_next_pay_amount|crmMoney:$row.pledge_currency}</td>