From 1c4d8c3e29018276ae59eff35b8facd6a637971c Mon Sep 17 00:00:00 2001 From: "Donald A. Lobo" Date: Tue, 12 Mar 2013 15:56:56 -0700 Subject: [PATCH] get mail to work, eliminate debug code - CRM-12101 --- CRM/Report/Form.php | 8 ++-- CRM/Report/Form/Contribute/Detail.php | 69 +++++++++++++-------------- CRM/Report/Utils/Report.php | 5 -- 3 files changed, 37 insertions(+), 45 deletions(-) diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 2df7b4bd28..f6cb0a5b4b 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -228,7 +228,7 @@ class CRM_Report_Form extends CRM_Core_Form { public $_columnHeaders = array(); public $_orderBy = NULL; public $_groupBy = NULL; - + /** * Variable to hold the currency alias */ @@ -338,7 +338,7 @@ class CRM_Report_Form extends CRM_Core_Form { } // lets always do a force if reset is found in the url. - if (CRM_Utils_Array::value('reset', $_GET)) { + if (CRM_Utils_Array::value('reset', $_REQUEST)) { $this->_force = 1; } @@ -2379,9 +2379,7 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND CRM_Core_Session::setStatus(ts("Report mail could not be sent."), ts('Mail Error'), 'error'); } - CRM_Utils_System::redirect(CRM_Utils_System::url(CRM_Utils_System::currentPath(), - 'reset=1' - )); + CRM_Utils_System::redirect(CRM_Utils_System::url(CRM_Utils_System::currentPath(), 'reset=1')); } elseif ($this->_outputMode == 'print') { echo $content; diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index 6602807d3c..500c664ceb 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -45,7 +45,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { protected $_summary = NULL; protected $_customGroupExtends = array( - 'Contribution'); + 'Contribution'); function __construct() { $config = CRM_Core_Config::singleton(); @@ -89,9 +89,9 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ), ), 'order_bys' => - array( - 'sort_name' => array( - 'title' => ts('Last Name, First Name'), + array( + 'sort_name' => array( + 'title' => ts('Last Name, First Name'), 'default' => '1', 'default_weight' => '0', 'default_order' => 'ASC' @@ -210,7 +210,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { 'type' => CRM_Utils_Type::T_STRING, ), 'financial_type_id' => - array( 'title' => ts( 'Financial Type' ), + array( 'title' => ts( 'Financial Type' ), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => CRM_Contribute_PseudoConstant::financialType(), 'type' => CRM_Utils_Type::T_INT, @@ -231,10 +231,10 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { 'total_amount' => array('title' => ts('Contribution Amount')), ), - 'order_bys' => array( - 'financial_type_id' => array('title' => ts('Financial Type')), - 'contribution_status_id' => array('title' => ts('Contribution Status')), - 'payment_instrument_id' => array('title' => ts('Payment Instrument')), + 'order_bys' => array( + 'financial_type_id' => array('title' => ts('Financial Type')), + 'contribution_status_id' => array('title' => ts('Contribution Status')), + 'payment_instrument_id' => array('title' => ts('Payment Instrument')), ), 'grouping' => 'contri-fields', ), @@ -272,7 +272,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ), ), ), - 'civicrm_note' => + 'civicrm_note' => array( 'dao' => 'CRM_Core_DAO_Note', 'fields' => @@ -297,14 +297,14 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ) + $this->addAddressFields(FALSE); $this->_tagFilter = TRUE; - + // Don't show Batch display column and filter unless batches are being used $this->_closedBatches = CRM_Batch_BAO_Batch::getBatches(); if (!empty($this->_closedBatches)) { $this->_columns['civicrm_batch']['dao'] = 'CRM_Batch_DAO_Batch'; $this->_columns['civicrm_batch']['fields']['batch_id'] = array( 'name' => 'id', - 'title' => ts('Batch Name'), + 'title' => ts('Batch Name'), ); $this->_columns['civicrm_batch']['filters']['bid'] = array( 'name' => 'id', @@ -315,7 +315,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ); $this->_columns['civicrm_entity_batch']['dao'] = 'CRM_Batch_DAO_EntityBatch'; $this->_columns['civicrm_entity_batch']['fields']['entity_batch_id'] = array( - 'name' => 'batch_id', + 'name' => 'batch_id', 'default' => TRUE, 'no_display' => TRUE, ); @@ -413,44 +413,44 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { $this->_from = NULL; $this->_from = " FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom} - INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} + INNER JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']} ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id AND {$this->_aliases['civicrm_contribution']}.is_test = 0"; if (!empty($this->_params['ordinality_value'])) { $this->_from .= " - INNER JOIN (SELECT c.id, IF(COUNT(oc.id) = 0, 0, 1) AS ordinality FROM civicrm_contribution c LEFT JOIN civicrm_contribution oc ON c.contact_id = oc.contact_id AND oc.receive_date < c.receive_date GROUP BY c.id) {$this->_aliases['civicrm_contribution_ordinality']} + INNER JOIN (SELECT c.id, IF(COUNT(oc.id) = 0, 0, 1) AS ordinality FROM civicrm_contribution c LEFT JOIN civicrm_contribution oc ON c.contact_id = oc.contact_id AND oc.receive_date < c.receive_date GROUP BY c.id) {$this->_aliases['civicrm_contribution_ordinality']} ON {$this->_aliases['civicrm_contribution_ordinality']}.id = {$this->_aliases['civicrm_contribution']}.id"; } $this->_from .= " - LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} - ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND + LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']} + ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND {$this->_aliases['civicrm_phone']}.is_primary = 1)"; if ($this->_addressField OR (!empty($this->_params['state_province_id_value']) OR !empty($this->_params['country_id_value']))) { $this->_from .= " - LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} - ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND + LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']} + ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND {$this->_aliases['civicrm_address']}.is_primary = 1\n"; } if ($this->_emailField) { - $this->_from .= " - LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} - ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND + $this->_from .= " + LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']} + ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND {$this->_aliases['civicrm_email']}.is_primary = 1\n"; } // include Honor name field if ($this->_nameFieldHonor) { $this->_from .= " - LEFT JOIN civicrm_contact contacthonor + LEFT JOIN civicrm_contact contacthonor ON contacthonor.id = {$this->_aliases['civicrm_contribution']}.honor_contact_id"; } // include Honor email field if ($this->_emailFieldHonor) { $this->_from .= " - LEFT JOIN civicrm_email emailhonor + LEFT JOIN civicrm_email emailhonor ON emailhonor.contact_id = {$this->_aliases['civicrm_contribution']}.honor_contact_id AND emailhonor.is_primary = 1\n"; } @@ -464,10 +464,10 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { //for contribution batches if ($this->_closedBatches && CRM_Utils_Array::value('batch_id', $this->_params['fields'])) { $this->_from .= " - LEFT JOIN civicrm_entity_batch {$this->_aliases['civicrm_entity_batch']} + LEFT JOIN civicrm_entity_batch {$this->_aliases['civicrm_entity_batch']} ON ({$this->_aliases['civicrm_entity_batch']}.entity_id = {$this->_aliases['civicrm_contribution']}.id AND {$this->_aliases['civicrm_entity_batch']}.entity_table = 'civicrm_contribution') - LEFT JOIN civicrm_batch {$this->_aliases['civicrm_batch']} + LEFT JOIN civicrm_batch {$this->_aliases['civicrm_batch']} ON {$this->_aliases['civicrm_batch']}.id = {$this->_aliases['civicrm_entity_batch']}.batch_id"; } } @@ -490,13 +490,12 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { $group = "\nGROUP BY {$this->_aliases['civicrm_contribution']}.currency"; $sql = "{$select} {$this->_from} {$this->_where} {$group}"; - crm_core_error::Debug( $sql); $dao = CRM_Core_DAO::executeQuery($sql); while ($dao->fetch()) { $totalAmount[] = CRM_Utils_Money::format($dao->amount, $dao->currency)."(".$dao->count.")"; $average[] = CRM_Utils_Money::format($dao->avg, $dao->currency); - $count += $dao->count; + $count += $dao->count; } $statistics['counts']['amount'] = array( 'title' => ts('Total Amount (Donations)'), @@ -648,7 +647,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { $lastKey = $rowNum; } } - + function sectionTotals( ) { // Reports using order_bys with sections must populate $this->_selectAliases in select() method. @@ -705,12 +704,12 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { // the last alias is the lowest-level section header; use count as-is $totals[$key] = $dao->ct; if ($showsumcontribs) { $sumcontribs[$key] = $dao->sumcontribs; } - } + } else { // other aliases are higher level; roll count into their total - $totals[$key] = (array_key_exists($key, $totals)) ? $totals[$key] + $dao->ct : $dao->ct; - if ($showsumcontribs) { - $sumcontribs[$key] = array_key_exists($key, $sumcontribs) ? $sumcontribs[$key] + $dao->sumcontribs : $dao->sumcontribs; + $totals[$key] = (array_key_exists($key, $totals)) ? $totals[$key] + $dao->ct : $dao->ct; + if ($showsumcontribs) { + $sumcontribs[$key] = array_key_exists($key, $sumcontribs) ? $sumcontribs[$key] + $dao->sumcontribs : $dao->sumcontribs; } } } @@ -718,8 +717,8 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { if ($showsumcontribs) { $totalandsum = array(); foreach ($totals as $key => $total) { - $totalandsumvals = array( - 1 => $total, + $totalandsumvals = array( + 1 => $total, 2 => CRM_Utils_Money::format($sumcontribs[$key]), ); $totalandsum[$key] = ts("%1 contributions: %2", $totalandsumvals); diff --git a/CRM/Report/Utils/Report.php b/CRM/Report/Utils/Report.php index 1daef5c4d5..7c5375bebd 100644 --- a/CRM/Report/Utils/Report.php +++ b/CRM/Report/Utils/Report.php @@ -347,11 +347,6 @@ WHERE inst.report_id = %1"; $obj = new CRM_Report_Page_Instance(); $is_error = 0; if (strstr(CRM_Utils_Array::value('name', $templateInfo), '_Form')) { - // get the last element which is the form name and emulate a post submit via _qf_default - $formName = CRM_Utils_String::getClassName($templateInfo['name']); - if ($formName) { - $_REQUEST['_qf_default'] = "{$formName}:submit"; - } $instanceInfo = array(); CRM_Report_BAO_Instance::retrieve(array('id' => $instanceId), $instanceInfo); -- 2.25.1