Merge pull request #7834 from mautic-inc/staging.multiple-emails-repo…

…rt-fix Report not showing properly clicks for multiple emails
mautic · Mar 19, 2020 · 16b47b7 · 16b47b7
2 parents 85f8db3 + 6c630dc
commit 16b47b7
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/app/bundles/EmailBundle/EventListener/ReportSubscriber.php b/app/bundles/EmailBundle/EventListener/ReportSubscriber.php
@@ -376,8 +376,8 @@ public function onReportGenerate(ReportGeneratorEvent $event)
 
                     if ($event->hasFilter('e.id')) {
                         $filterParam = $event->createParameterName();
-                        $qbcut->andWhere("cut2.channel_id = :{$filterParam}");
-                        $qb->setParameter($filterParam, $event->getFilterValue('e.id'), \PDO::PARAM_INT);
+                        $qbcut->andWhere($qb->expr()->in('cut2.channel_id', ":{$filterParam}"));
+                        $qb->setParameter($filterParam, $event->getFilterValues('e.id'), Connection::PARAM_INT_ARRAY);
                     }
 
                     $qb->leftJoin(

diff --git a/app/bundles/ReportBundle/Entity/Report.php b/app/bundles/ReportBundle/Entity/Report.php
@@ -384,6 +384,31 @@ public function getFilterValue($column)
         throw new \UnexpectedValueException("Column {$column} doesn't have any filter.");
     }
 
+    /**
+     * Get filter values from a specific filter.
+     *
+     * @param string $column
+     *
+     * @return array
+     *
+     * @throws \UnexpectedValueException
+     */
+    public function getFilterValues($column)
+    {
+        $values = [];
+        foreach ($this->getFilters() as $field) {
+            if ($column === $field['column']) {
+                $values[] = $field['value'];
+            }
+        }
+
+        if (empty($values)) {
+            throw new \UnexpectedValueException("Column {$column} doesn't have any filter.");
+        }
+
+        return $values;
+    }
+
     /**
      * @return mixed
      */

diff --git a/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php b/app/bundles/ReportBundle/Event/ReportGeneratorEvent.php
@@ -447,6 +447,20 @@ public function getFilterValue($column)
         return $this->getReport()->getFilterValue($column);
     }
 
+    /**
+     * Get filter values from a specific filter.
+     *
+     * @param string $column
+     *
+     * @return array
+     *
+     * @throws \UnexpectedValueException
+     */
+    public function getFilterValues($column)
+    {
+        return $this->getReport()->getFilterValues($column);
+    }
+
     /**
      * Check if the report has a groupBy columns selected.
      *

diff --git a/app/bundles/ReportBundle/Model/ReportModel.php b/app/bundles/ReportBundle/Model/ReportModel.php
@@ -692,6 +692,9 @@ public function getReportData(Report $entity, FormFactoryInterface $formFactory
             $params             = $query->getParameters();
 
             foreach ($params as $name => $param) {
+                if (is_array($param)) {
+                    $param = implode("','", $param);
+                }
                 $debugData['query'] = str_replace(":$name", "'$param'", $debugData['query']);
             }