From 4d5f6da97eeb75401a671af7a76081609c051bc7 Mon Sep 17 00:00:00 2001 From: Edsel Date: Wed, 15 Feb 2017 16:03:40 +0530 Subject: [PATCH] CRM-20277 Added credit card type field to contributions by household report --- .../Form/Contribute/HouseholdSummary.php | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php index 5801dafd76..ffaa4fd237 100644 --- a/CRM/Report/Form/Contribute/HouseholdSummary.php +++ b/CRM/Report/Form/Contribute/HouseholdSummary.php @@ -161,6 +161,24 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form { ), 'grouping' => 'contri-fields', ), + 'civicrm_financial_trxn' => array( + 'dao' => 'CRM_Financial_DAO_FinancialTrxn', + 'fields' => array( + 'card_type' => array( + 'title' => ts('Credit Card Type'), + 'dbAlias' => 'GROUP_CONCAT(financial_trxn_civireport.card_type SEPARATOR ",")', + ), + ), + 'filters' => array( + 'card_type' => array( + 'title' => ts('Credit Card Type'), + 'operatorType' => CRM_Report_Form::OP_MULTISELECT, + 'options' => CRM_Financial_DAO_FinancialTrxn::buildOptions('card_type'), + 'default' => NULL, + 'type' => CRM_Utils_Type::T_STRING, + ), + ), + ), 'civicrm_address' => array( 'dao' => 'CRM_Core_DAO_Address', 'fields' => array( @@ -267,6 +285,9 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form { {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1\n "; } + + // for credit card type + $this->addFinancialTrxnFromClause(); } public function where() { @@ -540,6 +561,11 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form { $row['civicrm_contribution_total_amount'] = CRM_Utils_Money::format($row['civicrm_contribution_total_amount'], $row['civicrm_contribution_currency']); } + if (!empty($row['civicrm_financial_trxn_card_type'])) { + $rows[$rowNum]['civicrm_financial_trxn_card_type'] = $this->getLabels($row['civicrm_financial_trxn_card_type'], 'CRM_Financial_DAO_FinancialTrxn', 'card_type'); + $entryFound = TRUE; + } + // Contribution amount links to view contribution if (($value = CRM_Utils_Array::value('civicrm_contribution_total_amount', $row)) && CRM_Core_Permission::check('access CiviContribute') -- 2.25.1