From 48069ca150d575c5fe43530f93e0791016f03fdc Mon Sep 17 00:00:00 2001 From: Edsel Date: Thu, 23 Apr 2015 18:13:32 +0530 Subject: [PATCH] CIVI-28 Contribution stats modified --- CRM/Contribute/BAO/Contribution.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 5570fbe299..743705f724 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -1184,6 +1184,7 @@ WHERE civicrm_contribution.contact_id = civicrm_contact.id } $startDate = "$year$monthDay"; $endDate = "$nextYear$monthDay"; + CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($financialTypes); $query = " SELECT count(*) as count, @@ -1191,11 +1192,14 @@ WHERE civicrm_contribution.contact_id = civicrm_contact.id avg(total_amount) as average, currency FROM civicrm_contribution b + LEFT JOIN civicrm_line_item i ON i.contribution_id = b.id AND i.entity_table = 'civicrm_contribution' WHERE b.contact_id IN ( $contactIDs ) AND b.contribution_status_id = 1 AND b.is_test = 0 AND b.receive_date >= $startDate AND b.receive_date < $endDate + AND b.financial_type_id IN (" . implode(',' , array_keys($financialTypes)) . ") + AND i.financial_type_id IN (" . implode(',' , array_keys($financialTypes)) . ") GROUP BY currency "; $dao = CRM_Core_DAO::executeQuery($query, CRM_Core_DAO::$_nullArray); -- 2.25.1