Merge pull request #4726 from atif-shaikh/CRM-5039

[civicrm-core.git] / CRM / Report / Form / Contribute / PCP.php

diff --git a/CRM/Report/Form/Contribute/PCP.php b/CRM/Report/Form/Contribute/PCP.php
index 890f9f0169fd3d5e37128d2dccea6c588e0297e2..915761055775b23c8de15d3bfd8c67274803738f 100644 (file)
--- a/CRM/Report/Form/Contribute/PCP.php
+++ b/CRM/Report/Form/Contribute/PCP.php
@@ -2,7 +2,7 @@
 
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -42,146 +42,128 @@ class CRM_Report_Form_Contribute_PCP extends CRM_Report_Form {
    */
   function __construct() {
     $this->_columns = array(
-      'civicrm_contact' =>
-      array(
+      'civicrm_contact' => array(
         'dao' => 'CRM_Contact_DAO_Contact',
-        'fields' =>
-        array(
-          'sort_name' =>
-          array('title' => ts('Supporter'),
+        'fields' => array(
+          'sort_name' => array(
+            'title' => ts('Supporter'),
             'required' => TRUE,
             'default' => TRUE,
           ),
-          'id' =>
-          array(
+          'id' => array(
             'required' => TRUE,
             'no_display' => TRUE,
           ),
-          'contact_type' =>
-          array(
+          'contact_type' => array(
             'title' => ts('Supporter Contact Type'),
           ),
-          'contact_sub_type' =>
-          array(
-            'title' => ts('Supporter Contact SubType'),
+          'contact_sub_type' => array(
+            'title' => ts('Supporter Contact Subtype'),
           ),
         ),
-        'filters' =>
-        array(
-          'sort_name' =>
-          array('title' => ts('Supporter Name'),
+        'filters' => array(
+          'sort_name' => array(
+            'title' => ts('Supporter Name'),
             'type' => CRM_Utils_Type::T_STRING,
             'operator' => 'like',
           ),
-          'id' =>
-          array('title' => ts('Contact ID'),
+          'id' => array(
+            'title' => ts('Contact ID'),
             'no_display' => TRUE,
           ),
         ),
         'grouping' => 'pcp-fields',
       ),
-      'civicrm_contribution_page' =>
-      array(
+      'civicrm_contribution_page' => array(
         'dao' => 'CRM_Contribute_DAO_ContributionPage',
-        'fields' =>
-        array(
-          'page_title' =>
-          array('title' => ts('Contribution Page Title'),
+        'fields' => array(
+          'page_title' => array(
+            'title' => ts('Contribution Page Title'),
             'name' => 'title',
             'default' => TRUE,
           ),
         ),
-        'filters' =>
-        array(
-          'page_title' =>
-          array('title' => ts('Contribution Page Title'),
+        'filters' => array(
+          'page_title' => array(
+            'title' => ts('Contribution Page Title'),
             'name' => 'title',
             'type' => CRM_Utils_Type::T_STRING,
           ),
         ),
         'grouping' => 'pcp-fields',
       ),
-      'civicrm_pcp' =>
-      array(
+      'civicrm_pcp' => array(
         'dao' => 'CRM_PCP_DAO_PCP',
-        'fields' =>
-        array(
-          'title' =>
-          array('title' => ts('Personal Campaign Title'),
+        'fields' => array(
+          'title' => array(
+            'title' => ts('Personal Campaign Title'),
             'default' => TRUE,
           ),
-          'goal_amount' =>
-          array('title' => ts('Goal Amount'),
+          'goal_amount' => array(
+            'title' => ts('Goal Amount'),
             'type' => CRM_Utils_Type::T_MONEY,
             'default' => TRUE,
           ),
         ),
-        'filters' =>
-        array(
-          'title' =>
-          array('title' => ts('Personal Campaign Title'),
+        'filters' => array(
+          'title' => array(
+            'title' => ts('Personal Campaign Title'),
             'type' => CRM_Utils_Type::T_STRING,
           ),
         ),
         'grouping' => 'pcp-fields',
       ),
-      'civicrm_contribution_soft' =>
-      array(
+      'civicrm_contribution_soft' => array(
         'dao' => 'CRM_Contribute_DAO_ContributionSoft',
-        'fields' =>
-        array(
-          'amount_1' =>
-          array('title' => ts('Committed Amount'),
+        'fields' => array(
+          'amount_1' => array(
+            'title' => ts('Committed Amount'),
             'name' => 'amount',
             'type' => CRM_Utils_Type::T_MONEY,
             'default' => TRUE,
-            'statistics' =>
-            array('sum' => ts('Committed Amount'),
+            'statistics' => array(
+              'sum' => ts('Committed Amount'),
             ),
           ),
-          'amount_2' =>
-          array('title' => ts('Amount Received'),
+          'amount_2' => array(
+            'title' => ts('Amount Received'),
             'name' => 'amount',
             'type' => CRM_Utils_Type::T_MONEY,
             'default' => TRUE,
             // nice trick with dbAlias
             'dbAlias' => 'SUM(IF( contribution_civireport.contribution_status_id > 1, 0, contribution_soft_civireport.amount))',
           ),
-          'soft_id' =>
-          array('title' => ts('Number of Donors'),
+          'soft_id' => array(
+            'title' => ts('Number of Donors'),
             'name' => 'id',
             'default' => TRUE,
-            'statistics' =>
-            array('count' => ts('Number of Donors'),
+            'statistics' => array(
+              'count' => ts('Number of Donors'),
             ),
           ),
         ),
-        'filters' =>
-        array(
-          'amount_2' =>
-          array('title' => ts('Amount Received'),
+        'filters' => array(
+          'amount_2' => array(
+            'title' => ts('Amount Received'),
             'type' => CRM_Utils_Type::T_MONEY,
             'dbAlias' => 'SUM(IF( contribution_civireport.contribution_status_id > 1, 0, contribution_soft_civireport.amount))',
           ),
         ),
         'grouping' => 'pcp-fields',
       ),
-      'civicrm_contribution' =>
-      array(
+      'civicrm_contribution' => array(
         'dao' => 'CRM_Contribute_DAO_Contribution',
-        'fields' =>
-        array(
-          'contribution_id' =>
-          array(
+        'fields' => array(
+          'contribution_id' => array(
             'name' => 'id',
             'no_display' => TRUE,
             'required' => TRUE,
           ),
-          'receive_date' =>
-          array('title' => ts('Most Recent Donation'),
+          'receive_date' => array(
+            'title' => ts('Most Recent Contribution'),
             'default' => TRUE,
-            'statistics' =>
-            array('max' => ts('Most Recent Donation'),
+            'statistics' => array(
+              'max' => ts('Most Recent Contribution'),
             ),
           ),
         ),
@@ -231,9 +213,9 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page'
 
           if (CRM_Utils_Array::value('type', $field) & CRM_Utils_Type::T_DATE) {
             $relative = CRM_Utils_Array::value("{$fieldName}_relative", $this->_params);
-            $from     = CRM_Utils_Array::value("{$fieldName}_from", $this->_params);
-            $to       = CRM_Utils_Array::value("{$fieldName}_to", $this->_params);
-            $clause   = $this->dateClause($field['name'], $relative, $from, $to, $field['type']);
+            $from = CRM_Utils_Array::value("{$fieldName}_from", $this->_params);
+            $to = CRM_Utils_Array::value("{$fieldName}_to", $this->_params);
+            $clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type']);
           }
           else {
             $op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params);
@@ -285,9 +267,10 @@ LEFT JOIN civicrm_contribution_page {$this->_aliases['civicrm_contribution_page'
   function statistics(&$rows) {
     $statistics = parent::statistics($rows);
 
-    $select = "SELECT SUM({$this->_aliases['civicrm_pcp']}.goal_amount) as goal_total, ".
-      "SUM({$this->_aliases['civicrm_contribution_soft']}.amount) as committed_total, ".
-      "COUNT({$this->_aliases['civicrm_contribution_soft']}.id) as donors_total, ".
+    $select =
+      "SELECT SUM({$this->_aliases['civicrm_pcp']}.goal_amount) as goal_total, " .
+      "SUM({$this->_aliases['civicrm_contribution_soft']}.amount) as committed_total, " .
+      "COUNT({$this->_aliases['civicrm_contribution_soft']}.id) as donors_total, " .
       "SUM(IF( contribution_civireport.contribution_status_id > 1, 0, contribution_soft_civireport.amount)) AS received_total ";
     $sql = "{$select} {$this->_from} {$this->_where}";
     $dao = CRM_Core_DAO::executeQuery($sql);