Merge pull request #108 from TheDMSGroup/quick-fix

[Quick Fix] For search and inital date range for timeline
TheDMSGroup · Jul 30, 2018 · 308e15f · 308e15f
2 parents c5e9070 + 7a59c29
commit 308e15f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Event/ContactClientTimelineEvent.php b/Event/ContactClientTimelineEvent.php
@@ -159,7 +159,7 @@ public function __construct(
         $this->forTimeline   = $forTimeline;
         $this->siteDomain    = $siteDomain;
 
-        if (!empty($filters['fromDate'])) {
+        if (!empty($filters['dateFrom'])) {
             $this->dateFrom = ($filters['dateFrom'] instanceof \DateTime)
                 ? $filters['dateFrom']
                 : new \DateTime($filters['dateFrom']);
@@ -478,9 +478,8 @@ public function getEventOrder()
     public function getQueryOptions()
     {
         return array_merge(
+            $this->filters,
             [
-                'options'    => $this->filters,
-                'logs'       => isset($this->filters['logs']) ? $this->filters['logs'] : null,
                 'order'      => $this->orderBy,
                 'paginated'  => !$this->countOnly,
                 'unitCounts' => $this->countOnly && $this->groupUnit,