CRM-17436 Make the Date and time filter on ContributionAggregate search aware of...
authorSeamus Lee <seamuslee001@gmail.com>
Fri, 23 Oct 2015 03:31:14 +0000 (03:31 +0000)
committerSeamus Lee <seamuslee001@gmail.com>
Fri, 23 Oct 2015 03:31:14 +0000 (03:31 +0000)
CRM/Contact/Form/Search/Custom/ContributionAggregate.php

index ed46a04fb224e7a705efcd583fc850d79971895c..568f43567a57d6d06e5127d4da89587cc7bd6cf6 100644 (file)
@@ -200,12 +200,15 @@ civicrm_contact AS contact_a {$this->_aclFrom}
     $clauses[] = "contrib.contact_id = contact_a.id";
     $clauses[] = "contrib.is_test = 0";
 
-    $startDate = CRM_Utils_Date::processDate($this->_formValues['start_date']);
+    $startTime = isset($this->_formValues['start_date_time']) ? $this->_formValues['start_date_time'] : '12:00AM';
+    $endTime = isset($this->formValues['end_date_time']) ?  $this->formValues['end_date_time'] : '11:59PM';
+
+    $startDate = CRM_Utils_Date::processDate($this->_formValues['start_date'], $startTime);
     if ($startDate) {
       $clauses[] = "contrib.receive_date >= $startDate";
     }
 
-    $endDate = CRM_Utils_Date::processDate($this->_formValues['end_date']);
+    $endDate = CRM_Utils_Date::processDate($this->_formValues['end_date'], $endTime);
     if ($endDate) {
       $clauses[] = "contrib.receive_date <= $endDate";
     }