Fixes matomo-org#6756, fix two regressions/bugs in row evolution of e…

…commerce item report: viewDataTable is overwritten by BaseEcommerceItem Report class metadata causing UI bugs since viewDataTable is not graphEvolution, graph visualizations should not format metrics in any way prior to generating jqplot JSON.

core/Plugin/Visualization.php

@@ -374,11 +374,13 @@ private function applyFilters()
             $this->dataTable->applyQueuedFilters();
         }
 
-        $formatter = $this->metricsFormatter;
-        $report = $this->report;
-        $this->dataTable->filter(function (DataTable $table) use ($formatter, $report) {
-            $formatter->formatMetrics($table, $report);
-        });
+        if ($this->requestConfig->shouldFormatMetrics()) {
+            $formatter = $this->metricsFormatter;
+            $report = $this->report;
+            $this->dataTable->filter(function (DataTable $table) use ($formatter, $report) {
+                $formatter->formatMetrics($table, $report);
+            });
+        }
     }
 
     private function removeEmptyColumnsFromDisplay()

core/ViewDataTable/RequestConfig.php

@@ -356,4 +356,9 @@ public function getApiMethodToRequest()
 
         return $method;
     }
+
+    public function shouldFormatMetrics()
+    {
+        return Common::getRequestVar('format_metrics', '1', 'string', $this->request_parameters_to_modify) != 0;
+    }
 }

plugins/CoreVisualizations/JqplotDataGenerator.php

@@ -86,7 +86,6 @@ public function generate($dataTable)
                 $dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total'));
             }
 
-            $dataTable->applyQueuedFilters();
             $this->initChartObjectData($dataTable, $visualization);
         }
 

plugins/CoreVisualizations/Visualizations/Graph.php

@@ -58,7 +58,9 @@ public function beforeLoadDataTable()
             $this->requestConfig->request_parameters_to_modify['filter_truncate'] = $this->config->max_graph_elements - 1;
         }
 
+        $this->requestConfig->disable_queued_filters = 1;
         $this->requestConfig->request_parameters_to_modify['disable_queued_filters'] = 1;
+        $this->requestConfig->request_parameters_to_modify['format_metrics'] = 0;
     }
 
     /**

plugins/Goals/Reports/BaseEcommerceItem.php

@@ -13,6 +13,8 @@
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Plugin\ViewDataTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
+use Piwik\Plugins\CustomPages\Visualization\HtmlTable;
 use Piwik\Plugins\Goals\Goals;
 use Piwik\Plugins\Goals\Columns\Metrics\AveragePrice;
 use Piwik\Plugins\Goals\Columns\Metrics\AverageQuantity;
@@ -105,8 +107,10 @@ public function configureView(ViewDataTable $view)
         $view->config->addTranslations($translations);
         $view->config->columns_to_display = $columnsOrdered;
 
-        $view->config->custom_parameters['viewDataTable'] =
-            $abandonedCart ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART : Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER;
+        if ($view instanceof HtmlTable) {
+            $view->config->custom_parameters['viewDataTable'] =
+                $abandonedCart ? Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART : Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER;
+        }
     }
 
     private function isAbandonedCart()