Scheduled reports: Flatten all the reports (#10870)

* Flatten all the reports

* Flattened data in tests (not sure why SMS +evo% are not displayed, it works locally)

1 files changed, 40 insertions, 40 deletions

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 c228c82177..1bfbd4bae1 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
@@ -1,7 +1,7 @@
 All Websites dashboard
 label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders_evolution,ecommerce_revenue_evolution
-Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100%
-Piwik test,2,1,1,$ 250,1,0,$ 0,100%,100%,100%,100%,100%,0,0
+Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,0%,0%,0%,0%,0%
+Piwik test,2,1,1,$ 250,1,1,$ 250,100%,100%,0%,0,0%,0,0
 
 Visits Summary
 nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -12,9 +12,9 @@ No data available
 
 Custom Variables
 label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate
-ValueIsZero,5,16,$ 13361.11,3.2,00:22:49,20%
-VisitorType,5,16,$ 13361.11,3.2,00:22:49,20%
-VisitorName,4,12,$ 13351.11,3,00:25:32,25%
+ValueIsZero - Custom Variable value not defined,5,16,$ 13361.11,3.2,00:22:49,20%
+VisitorType - NewLoggedOut,5,16,$ 13361.11,3.2,00:22:49,20%
+VisitorName - Great name!,4,12,$ 13351.11,3,00:25:32,25%
 
 Device type
 label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -231,37 +231,37 @@ nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uni
 
 Page URLs
 label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate
-/index.htm,4,16,0%,00:03:23,100%
+index.htm,4,16,0%,00:03:23,100%
 
 Entry pages
 label,entry_nb_visits,entry_bounce_count,bounce_rate
-/index.htm,4,0,0%
+index.htm,4,0,0%
 
 Entry page titles
 label,entry_nb_visits,entry_bounce_count,bounce_rate
- View product left in cart,1,0,0%
- incredible title!,1,0,0%
- Looking at Electronics & Cameras page with a page level custom variable,1,0,0%
+View product left in cart,1,0,0%
+incredible title!,1,0,0%
+Looking at Electronics & Cameras page with a page level custom variable,1,0,0%
 
 Exit pages
 label,nb_visits,exit_nb_visits,exit_rate
-/index.htm,4,4,100%
+index.htm,4,4,100%
 
 Exit page titles
 label,nb_visits,exit_nb_visits,exit_rate
- View product left in cart,3,3,100%
- Another Product page with multiple categories,1,1,100%
+View product left in cart,3,3,100%
+Another Product page with multiple categories,1,1,100%
 
 Page titles
 label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate
- View product left in cart,3,9,0%,00:02:00,100%
- Another Product page,1,1,0%,00:06:00,0%
- Another Product page with multiple categories,1,1,0%,00:00:00,100%
- Another Product page with no category,1,1,0%,00:00:00,0%
- incredible title!,1,1,0%,00:06:00,0%
- Looking at Electronics & Cameras page again,1,1,0%,00:06:00,0%
- Looking at Electronics & Cameras page with a page level custom variable,1,1,0%,00:06:00,0%
- Looking at product page,1,1,0%,00:12:00,0%
+View product left in cart,3,9,0%,00:02:00,100%
+Another Product page,1,1,0%,00:06:00,0%
+Another Product page with multiple categories,1,1,0%,00:00:00,100%
+Another Product page with no category,1,1,0%,00:00:00,0%
+incredible title!,1,1,0%,00:06:00,0%
+Looking at Electronics & Cameras page again,1,1,0%,00:06:00,0%
+Looking at Electronics & Cameras page with a page level custom variable,1,1,0%,00:06:00,0%
+Looking at product page,1,1,0%,00:12:00,0%
 
 Site Search Keywords
 No data available
@@ -323,7 +323,7 @@ No data available
 
 Ecommerce Orders
 nb_conversions,nb_visits_converted,revenue,revenue_subtotal,revenue_tax,revenue_shipping,revenue_discount,items,avg_order_revenue,conversion_rate
-4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,40%
+4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,0%
 
 Ecommerce Orders - Visits to Conversion
 label,nb_conversions
@@ -360,7 +360,7 @@ label,nb_conversions
 
 Abandoned Carts
 nb_conversions,revenue,items,avg_order_revenue,conversion_rate
-3,$ 7530.33,12,$ 2510.11,60%
+3,$ 7530.33,12,$ 2510.11,0%
 
 Abandoned Carts - Visits to Conversion
 label,nb_conversions
@@ -397,35 +397,35 @@ label,nb_conversions
 
 Product SKU
 label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate
-SKU2,$ 1500,1,1,1,$ 1500,1,100%
-SKU VERY nice indeed,$ 1011.22,3,2,4,$ 255.61,1.5,50%
-ANOTHER SKU HERE,$ 600,6,1,0,$ 100,6,0%
-TRIPOD SKU,$ 200,2,1,0,$ 100,2,0%
+SKU2,$ 1500,1,1,1,$ 0,1,100%
+SKU VERY nice indeed,$ 1011.22,3,2,4,$ 0,1.5,50%
+ANOTHER SKU HERE,$ 600,6,1,0,$ 0,6,0%
+TRIPOD SKU,$ 200,2,1,0,$ 0,2,0%
 SKU IN ABANDONED CART TWO,$ 0,0,0,3,$ 0,0,0%
 
 Product Name
 label,revenue,quantity,orders,avg_price,avg_quantity,conversion_rate,nb_visits
-Canon SLR,$ 1500,1,1,$ 1500,1,0%,0
-PRODUCT name,$ 1011.22,3,2,$ 255.61,1.5,100%,2
-PRODUCT name BIS,$ 600,6,1,$ 100,6,0%,0
-TRIPOD - bought day after,$ 200,2,1,$ 100,2,0%,0
+Canon SLR,$ 1500,1,1,$ 0,1,0%,0
+PRODUCT name,$ 1011.22,3,2,$ 0,1.5,100%,2
+PRODUCT name BIS,$ 600,6,1,$ 0,6,0%,0
+TRIPOD - bought day after,$ 200,2,1,$ 0,2,0%,0
 PRODUCT TWO LEFT in cart,$ 0,0,0,$ 0,0,0%,3
 PRODUCT THREE LEFT in cart,$ 0,0,0,$ 1332,0,0%,3
 
 Product Category
 label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate
-Electronics & Cameras,$ 2500,3,2,3,$ 1000,1.5,66.67%
-Multiple Category 1,$ 1000,2,1,1,$ 500,2,100%
-Multiple Category 2,$ 1000,2,1,1,$ 500,2,100%
-Multiple Category 4,$ 1000,2,1,1,$ 500,2,100%
-Multiple Category 5,$ 1000,2,1,1,$ 500,2,100%
-Product Category not defined,$ 611.22,7,2,4,$ 55.61,3.5,50%
-Tools,$ 200,2,1,0,$ 100,2,0%
+Electronics & Cameras,$ 2500,3,2,3,$ 0,1.5,66.67%
+Multiple Category 1,$ 1000,2,1,1,$ 0,2,100%
+Multiple Category 2,$ 1000,2,1,1,$ 0,2,100%
+Multiple Category 4,$ 1000,2,1,1,$ 0,2,100%
+Multiple Category 5,$ 1000,2,1,1,$ 0,2,100%
+Product Category not defined,$ 611.22,7,2,4,$ 0,3.5,50%
+Tools,$ 200,2,1,0,$ 0,2,0%
 Category TWO LEFT in cart,$ 0,0,0,3,$ 0,0,0%
 
 Goals
 nb_conversions,nb_visits_converted,revenue,conversion_rate
-5,4,$ 13361.11,80%
+5,4,$ 13361.11,0%
 
 Visits to Conversion
 label,nb_conversions,revenue
@@ -462,7 +462,7 @@ label,nb_conversions,revenue
 
 Goal title match  triggered ONCE
 nb_conversions,nb_visits_converted,revenue,conversion_rate
-1,1,$ 10,20%
+1,1,$ 10,0%
 
 title match  triggered ONCE - Visits to Conversion
 label,nb_conversions