From c8daaabc8b1dcee3c2db01665ef98dd1883cbf7c Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Mon, 24 Nov 2014 01:57:00 -0800
Subject: [PATCH] Do not display avg_order_revenue in processed reports for
Goals.get w/ idGoal set to ecommerce goal.
---
plugins/Goals/Reports/Get.php | 2 +-
...et_NormalGoal__API.getProcessedReport_day.xml | 3 ---
...duledReports.generateReport_week.original.csv | 8 ++++----
...uledReports.generateReport_week.original.html | 16 ----------------
4 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/plugins/Goals/Reports/Get.php b/plugins/Goals/Reports/Get.php
index f9c8dc2355..78cf680b66 100644
--- a/plugins/Goals/Reports/Get.php
+++ b/plugins/Goals/Reports/Get.php
@@ -18,7 +18,7 @@ class Get extends BaseGoal
parent::init();
$this->name = Piwik::translate('Goals_Goals');
- $this->processedMetrics = array(new ConversionRate(), 'avg_order_revenue');
+ $this->processedMetrics = array(new ConversionRate());
$this->documentation = ''; // TODO
$this->order = 1;
$this->orderGoal = 50;
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml
index ea5aedc554..d492e19c4b 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml
@@ -20,7 +20,6 @@
</metricsDocumentation>
<processedMetrics>
<conversion_rate>Conversion Rate</conversion_rate>
- <avg_order_revenue>Average Order Value</avg_order_revenue>
</processedMetrics>
<imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Goals&apiAction=get&idGoal=1&period=day&date=2011-03-07,2011-04-05</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Goals&apiAction=get&idGoal=1&period=day&date=2011-03-07,2011-04-05</imageGraphEvolutionUrl>
@@ -31,14 +30,12 @@
<nb_visits_converted>Visits with Conversions</nb_visits_converted>
<revenue>Revenue</revenue>
<conversion_rate>Conversion Rate</conversion_rate>
- <avg_order_revenue>Average Order Value</avg_order_revenue>
</columns>
<reportData>
<nb_conversions>1</nb_conversions>
<nb_visits_converted>1</nb_visits_converted>
<revenue>$ 10</revenue>
<conversion_rate>33.33%</conversion_rate>
- <avg_order_revenue>$ 0</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 51077efcb5..5fff1f5e2c 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
@@ -326,8 +326,8 @@ Social Networks
No data available
Goals
-nb_conversions,nb_visits_converted,revenue,conversion_rate,avg_order_revenue
-5,4,$ 13361.11,80%,$ 0
+nb_conversions,nb_visits_converted,revenue,conversion_rate
+5,4,$ 13361.11,80%
Visits to Conversion
label,nb_conversions,revenue
@@ -363,8 +363,8 @@ label,nb_conversions,revenue
365+ days,0,$ 0
Goal title match triggered ONCE
-nb_conversions,nb_visits_converted,revenue,conversion_rate,avg_order_revenue
-1,1,$ 10,20%,$ 0
+nb_conversions,nb_visits_converted,revenue,conversion_rate
+1,1,$ 10,20%
title match triggered ONCE - 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 e5eefe4d30..e278b621de 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
@@ -4837,14 +4837,6 @@
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
80%
</td>
- </tr>
-
- <tr style="">
- <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
- </td>
</tr>
</tbody>
</table>
@@ -5246,14 +5238,6 @@
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
20%
</td>
- </tr>
-
- <tr style="">
- <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
- </td>
</tr>
</tbody>
</table>
--
GitLab