From 987c184483e496442e5c8cf50ab93a4f9046b231 Mon Sep 17 00:00:00 2001 From: "deb.monish" Date: Fri, 24 Mar 2017 10:18:31 +0530 Subject: [PATCH] Qa fix --- CRM/Report/Form/Contribute/Recur.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/CRM/Report/Form/Contribute/Recur.php b/CRM/Report/Form/Contribute/Recur.php index ee55061569..6ec3dd3cac 100644 --- a/CRM/Report/Form/Contribute/Recur.php +++ b/CRM/Report/Form/Contribute/Recur.php @@ -118,7 +118,7 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form { 'card_type' => array( 'title' => ts('Credit Card Type'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Core_PseudoConstant::get('CRM_Financial_DAO_FinancialTrxn', 'card_type'), + 'options' => CRM_Financial_DAO_FinancialTrxn::buildOptions('card_type'), 'default' => NULL, 'type' => CRM_Utils_Type::T_STRING, ), @@ -283,14 +283,7 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form { {$this->_aliases['civicrm_phone']}.is_primary = 1)"; // for credit card type - if ($this->isTableSelected('civicrm_financial_trxn')) { - $this->_from .= " - LEFT JOIN civicrm_entity_financial_trxn eftcc - ON ({$this->_aliases['civicrm_contribution']}.id = eftcc.entity_id AND - eftcc.entity_table = 'civicrm_contribution') - LEFT JOIN civicrm_financial_trxn {$this->_aliases['civicrm_financial_trxn']} - ON {$this->_aliases['civicrm_financial_trxn']}.id = eftcc.financial_trxn_id"; - } + $this->addFinancialTrxnFromClause(); } public function groupBy() { -- 2.25.1