From 9affe2543bafafc711ffb45a3661553f12db13a9 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Tue, 2 Dec 2014 17:27:58 -0800
Subject: [PATCH] Refs #6756, fix regression in last commit.
---
plugins/CoreVisualizations/JqplotDataGenerator.php | 1 +
plugins/Goals/Reports/BaseEcommerceItem.php | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php
index 3b8ec8a752..14e796cd0d 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator.php
@@ -86,6 +86,7 @@ class JqplotDataGenerator
$dataTable->queueFilter('AddSummaryRow', Piwik::translate('General_Total'));
}
+ $dataTable->applyQueuedFilters();
$this->initChartObjectData($dataTable, $visualization);
}
diff --git a/plugins/Goals/Reports/BaseEcommerceItem.php b/plugins/Goals/Reports/BaseEcommerceItem.php
index ce491796a8..685a53ca03 100644
--- a/plugins/Goals/Reports/BaseEcommerceItem.php
+++ b/plugins/Goals/Reports/BaseEcommerceItem.php
@@ -71,9 +71,11 @@ abstract class BaseEcommerceItem extends BaseEcommerce
$view->config->show_exclude_low_population = false;
$view->config->show_table_all_columns = false;
- $moneyColumns = array('revenue');
- $formatter = array(new Formatter(), 'getPrettyMoney');
- $view->config->filters[] = array('ColumnCallbackReplace', array($moneyColumns, $formatter, array($idSite)));
+ if (!($view instanceof Evolution)) {
+ $moneyColumns = array('revenue');
+ $formatter = array(new Formatter(), 'getPrettyMoney');
+ $view->config->filters[] = array('ColumnCallbackReplace', array($moneyColumns, $formatter, array($idSite)));
+ }
$view->requestConfig->filter_limit = 10;
$view->requestConfig->filter_sort_column = 'revenue';
--
GitLab