From 4895eb2f92c59a57fc79f3023f76799e7b51d649 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Tue, 11 Nov 2014 01:27:29 -0800
Subject: [PATCH] Make sure API.get does not return extra parameters when
columns parameter is supplied.
---
plugins/API/API.php | 5 +++++
...mmerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml | 1 +
...merceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml | 1 +
...a_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml | 2 +-
...in_csv__ScheduledReports.generateReport_week.original.csv | 2 +-
..._only__ScheduledReports.generateReport_week.original.html | 2 +-
6 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 891062cbb0..f522a9add2 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -410,6 +410,11 @@ class API extends \Piwik\Plugin\API
$this->mergeDataTables($mergedDataTable, $dataTable);
}
}
+
+ if (!empty($columnsMap)) {
+ $mergedDataTable->queueFilter('ColumnDelete', array(false, array_keys($columnsMap)));
+ }
+
return $mergedDataTable;
}
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
index 343be649b7..6e377c1d41 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_day.xml
@@ -5,4 +5,5 @@
<conversion_rate>66.67</conversion_rate>
<revenue>5020.22</revenue>
<items>8</items>
+ <avg_order_revenue>2510.11</avg_order_revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
index a2d20e0f55..f745e2b50a 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_GoalAbandonedCart__Goals.get_week.xml
@@ -5,4 +5,5 @@
<conversion_rate>60</conversion_rate>
<revenue>7530.33</revenue>
<items>12</items>
+ <avg_order_revenue>2510.11</avg_order_revenue>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml
index 77c4d9cfc9..56e26922bd 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml
@@ -38,7 +38,7 @@
<conversion_rate>66.67%</conversion_rate>
<revenue>$ 5020.22</revenue>
<items>8</items>
- <avg_order_revenue>$ 0</avg_order_revenue>
+ <avg_order_revenue>$ 2510.11</avg_order_revenue>
</reportData>
<reportMetadata />
<reportTotal>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index fe483e691d..a9d0428a72 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -166,7 +166,7 @@ label,nb_conversions
Abandoned Carts
nb_conversions,conversion_rate,revenue,items,avg_order_revenue
-3,60%,$ 7530.33,12,$ 0
+3,60%,$ 7530.33,12,$ 2510.11
Abandoned Carts - Visits to Conversion
label,nb_conversions
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index aa496b9878..c2452282d2 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -3207,7 +3207,7 @@
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
Average Order Value </td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- $ 0
+ $ 2510.11
</td>
</tr>
</tbody>
--
GitLab