Merge pull request #10763 from JMAConsulting/CRM-20967

CRM-20967, use is_payment = TRUE to retrieve payments
civicrm · Jul 31, 2017 · 6d7e8a2 · 6d7e8a2
2 parents e53b68a + 8675271
commit 6d7e8a2
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/CRM/Report/Form/Event/ParticipantListing.php b/CRM/Report/Form/Event/ParticipantListing.php
@@ -192,12 +192,12 @@ public function __construct() {
           'participant_register_date' => array('title' => ts('Registration Date')),
           'total_paid' => array(
             'title' => ts('Total Paid'),
-            'dbAlias' => 'SUM(ft.total_amount)',
+            'dbAlias' => 'IFNULL(SUM(ft.total_amount), 0)',
             'type' => 1024,
           ),
           'balance' => array(
             'title' => ts('Balance'),
-            'dbAlias' => 'participant_civireport.fee_amount - SUM(ft.total_amount)',
+            'dbAlias' => 'participant_civireport.fee_amount - IFNULL(SUM(ft.total_amount), 0)',
             'type' => 1024,
           ),
         ),
@@ -563,14 +563,9 @@ public function from() {
       $this->_from .= "
             LEFT JOIN civicrm_entity_financial_trxn eft
                   ON (eft.entity_id = {$this->_aliases['civicrm_contribution']}.id)
-            LEFT JOIN civicrm_financial_account fa
-                  ON (fa.account_type_code = 'AR')
-            LEFT JOIN civicrm_financial_account fae
-                  ON (fae.account_type_code = 'EXP')
             LEFT JOIN civicrm_financial_trxn ft
                   ON (ft.id = eft.financial_trxn_id AND eft.entity_table = 'civicrm_contribution') AND
-                     (ft.to_financial_account_id != fa.id) AND
-                     (ft.to_financial_account_id != fae.id)
+                     (ft.is_payment = 1)
       ";
     }
   }