diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-11-15 16:10:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 16:10:26 +0300 |
| commit | 1f2fdec009b85d8cdec42dd799015cf174cdee5e (patch) | |
| tree | 5fef15f4bd7245ec724e1e454b19d33e1a26100b /tests/PHPUnit/System | |
| parent | d5cf53f485e85d2e3facd9136caf5cb846085dbb (diff) | |
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)
Diffstat (limited to 'tests/PHPUnit/System')
7 files changed, 284 insertions, 240 deletions
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index 09d4c5e5ea..8d4e84435c 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -10,95 +10,95 @@ try 'php archive.php --url=http://your.piwik/path' ------------------------------------------------------- -INFO [2016-11-15 01:01:32] --------------------------- -INFO [2016-11-15 01:01:32] INIT -INFO [2016-11-15 01:01:32] Running Piwik 3.0.0-b2 as Super User -INFO [2016-11-15 01:01:32] --------------------------- -INFO [2016-11-15 01:01:32] NOTES -INFO [2016-11-15 01:01:32] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO [2016-11-15 01:01:32] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO [2016-11-15 01:01:32] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO [2016-11-15 01:01:32] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. -INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 -INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 -INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 -INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 -INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 -INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 -INFO [2016-11-15 01:01:32] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 -INFO [2016-11-15 01:01:32] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 -INFO [2016-11-15 01:01:32] --------------------------- -INFO [2016-11-15 01:01:32] START -INFO [2016-11-15 01:01:32] Starting Piwik reports archiving... -INFO [2016-11-15 01:01:32] Old report was invalidated for website id 1 -INFO [2016-11-15 01:01:32] Will pre-process for website id = 1, period = day, date = last52 -INFO [2016-11-15 01:01:32] - pre-processing all visits -INFO [2016-11-15 01:01:34] - pre-processing segment 1/3 browserCode==IE -INFO [2016-11-15 01:01:34] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:01:34] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:01:37] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.036s -INFO [2016-11-15 01:01:37] Will pre-process for website id = 1, period = week, date = last260 -INFO [2016-11-15 01:01:37] - pre-processing all visits -INFO [2016-11-15 01:01:37] - pre-processing segment 1/3 browserCode==IE -INFO [2016-11-15 01:01:37] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:02:33] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:03:02] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 84.465s -INFO [2016-11-15 01:03:02] Will pre-process for website id = 1, period = month, date = last52 -INFO [2016-11-15 01:03:02] - pre-processing all visits -INFO [2016-11-15 01:03:02] - pre-processing segment 1/3 browserCode==IE -INFO [2016-11-15 01:03:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:03:13] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:03:19] Archived website id = 1, period = month, 3 segments, 41 visits in last 52 months, 0 visits this month, Time elapsed: 17.197s -INFO [2016-11-15 01:03:19] Will pre-process for website id = 1, period = year, date = last7 -INFO [2016-11-15 01:03:19] - pre-processing all visits -INFO [2016-11-15 01:03:19] - pre-processing segment 1/3 browserCode==IE -INFO [2016-11-15 01:03:19] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:03:23] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-11-15 01:03:25] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 6.455s -INFO [2016-11-15 01:03:25] Archived website id = 1, 16 API requests, Time elapsed: 113.161s [1/3 done] -INFO [2016-11-15 01:03:25] Old report was invalidated for website id 2 -INFO [2016-11-15 01:03:25] Will pre-process for website id = 2, period = day, date = last52 -INFO [2016-11-15 01:03:25] - pre-processing all visits -INFO [2016-11-15 01:03:27] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.523s -INFO [2016-11-15 01:03:27] Will pre-process for website id = 2, period = week, date = last260 -INFO [2016-11-15 01:03:27] - pre-processing all visits -INFO [2016-11-15 01:03:47] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 19.715s -INFO [2016-11-15 01:03:47] Will pre-process for website id = 2, period = month, date = last52 -INFO [2016-11-15 01:03:47] - pre-processing all visits -INFO [2016-11-15 01:03:50] Archived website id = 2, period = month, 0 segments, 1 visits in last 52 months, 0 visits this month, Time elapsed: 3.855s -INFO [2016-11-15 01:03:50] Will pre-process for website id = 2, period = year, date = last7 -INFO [2016-11-15 01:03:50] - pre-processing all visits -INFO [2016-11-15 01:03:51] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.058s -INFO [2016-11-15 01:03:51] Archived website id = 2, 4 API requests, Time elapsed: 26.156s [2/3 done] -INFO [2016-11-15 01:03:52] Old report was invalidated for website id 3 -INFO [2016-11-15 01:03:52] Will pre-process for website id = 3, period = day, date = last52 -INFO [2016-11-15 01:03:52] - pre-processing all visits -INFO [2016-11-15 01:03:53] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.536s -INFO [2016-11-15 01:03:53] Will pre-process for website id = 3, period = week, date = last260 -INFO [2016-11-15 01:03:53] - pre-processing all visits -INFO [2016-11-15 01:04:14] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 20.828s -INFO [2016-11-15 01:04:14] Will pre-process for website id = 3, period = month, date = last52 -INFO [2016-11-15 01:04:14] - pre-processing all visits -INFO [2016-11-15 01:04:18] Archived website id = 3, period = month, 0 segments, 15 visits in last 52 months, 0 visits this month, Time elapsed: 4.449s -INFO [2016-11-15 01:04:18] Will pre-process for website id = 3, period = year, date = last7 -INFO [2016-11-15 01:04:18] - pre-processing all visits -INFO [2016-11-15 01:04:20] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 1.866s -INFO [2016-11-15 01:04:20] Archived website id = 3, 4 API requests, Time elapsed: 28.684s [3/3 done] -INFO [2016-11-15 01:04:20] Done archiving! -INFO [2016-11-15 01:04:20] --------------------------- -INFO [2016-11-15 01:04:20] SUMMARY -INFO [2016-11-15 01:04:20] Total visits for today across archived websites: 0 -INFO [2016-11-15 01:04:20] Archived today's reports for 3 websites -INFO [2016-11-15 01:04:20] Archived week/month/year for 3 websites -INFO [2016-11-15 01:04:20] Skipped 0 websites -INFO [2016-11-15 01:04:20] - 0 skipped because no new visit since the last script execution -INFO [2016-11-15 01:04:20] - 0 skipped because existing daily reports are less than 150 seconds old -INFO [2016-11-15 01:04:20] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old -INFO [2016-11-15 01:04:20] Total API requests: 24 -INFO [2016-11-15 01:04:20] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 168167 ms, no error -INFO [2016-11-15 01:04:20] Time elapsed: 168.167s -INFO [2016-11-15 01:04:20] --------------------------- -INFO [2016-11-15 01:04:20] SCHEDULED TASKS -INFO [2016-11-15 01:04:20] Starting Scheduled tasks... -INFO [2016-11-15 01:04:20] done -INFO [2016-11-15 01:04:20] ---------------------------
\ No newline at end of file +INFO [2016-11-15 10:10:50] --------------------------- +INFO [2016-11-15 10:10:50] INIT +INFO [2016-11-15 10:10:50] Running Piwik 3.0.0-b2 as Super User +INFO [2016-11-15 10:10:50] --------------------------- +INFO [2016-11-15 10:10:50] NOTES +INFO [2016-11-15 10:10:50] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. +INFO [2016-11-15 10:10:50] See the doc at: http://piwik.org/docs/setup-auto-archiving/ +INFO [2016-11-15 10:10:50] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. +INFO [2016-11-15 10:10:50] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. +INFO [2016-11-15 10:10:50] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 +INFO [2016-11-15 10:10:50] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 +INFO [2016-11-15 10:10:50] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 +INFO [2016-11-15 10:10:50] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 +INFO [2016-11-15 10:10:50] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 +INFO [2016-11-15 10:10:50] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 +INFO [2016-11-15 10:10:50] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 +INFO [2016-11-15 10:10:50] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 +INFO [2016-11-15 10:10:50] --------------------------- +INFO [2016-11-15 10:10:50] START +INFO [2016-11-15 10:10:50] Starting Piwik reports archiving... +INFO [2016-11-15 10:10:50] Old report was invalidated for website id 1 +INFO [2016-11-15 10:10:50] Will pre-process for website id = 1, period = day, date = last52 +INFO [2016-11-15 10:10:50] - pre-processing all visits +INFO [2016-11-15 10:10:51] - pre-processing segment 1/3 browserCode==IE +INFO [2016-11-15 10:10:51] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:10:52] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:10:55] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.264s +INFO [2016-11-15 10:10:55] Will pre-process for website id = 1, period = week, date = last260 +INFO [2016-11-15 10:10:55] - pre-processing all visits +INFO [2016-11-15 10:10:55] - pre-processing segment 1/3 browserCode==IE +INFO [2016-11-15 10:10:55] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:11:48] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:12:18] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 82.692s +INFO [2016-11-15 10:12:18] Will pre-process for website id = 1, period = month, date = last52 +INFO [2016-11-15 10:12:18] - pre-processing all visits +INFO [2016-11-15 10:12:18] - pre-processing segment 1/3 browserCode==IE +INFO [2016-11-15 10:12:18] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:12:29] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:12:36] Archived website id = 1, period = month, 3 segments, 41 visits in last 52 months, 0 visits this month, Time elapsed: 17.752s +INFO [2016-11-15 10:12:36] Will pre-process for website id = 1, period = year, date = last7 +INFO [2016-11-15 10:12:36] - pre-processing all visits +INFO [2016-11-15 10:12:36] - pre-processing segment 1/3 browserCode==IE +INFO [2016-11-15 10:12:36] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:12:40] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2016-11-15 10:12:42] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 6.611s +INFO [2016-11-15 10:12:42] Archived website id = 1, 16 API requests, Time elapsed: 112.328s [1/3 done] +INFO [2016-11-15 10:12:42] Old report was invalidated for website id 2 +INFO [2016-11-15 10:12:42] Will pre-process for website id = 2, period = day, date = last52 +INFO [2016-11-15 10:12:42] - pre-processing all visits +INFO [2016-11-15 10:12:44] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.616s +INFO [2016-11-15 10:12:44] Will pre-process for website id = 2, period = week, date = last260 +INFO [2016-11-15 10:12:44] - pre-processing all visits +INFO [2016-11-15 10:13:04] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 20.502s +INFO [2016-11-15 10:13:04] Will pre-process for website id = 2, period = month, date = last52 +INFO [2016-11-15 10:13:04] - pre-processing all visits +INFO [2016-11-15 10:13:08] Archived website id = 2, period = month, 0 segments, 1 visits in last 52 months, 0 visits this month, Time elapsed: 4.092s +INFO [2016-11-15 10:13:08] Will pre-process for website id = 2, period = year, date = last7 +INFO [2016-11-15 10:13:08] - pre-processing all visits +INFO [2016-11-15 10:13:09] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.049s +INFO [2016-11-15 10:13:09] Archived website id = 2, 4 API requests, Time elapsed: 27.263s [2/3 done] +INFO [2016-11-15 10:13:09] Old report was invalidated for website id 3 +INFO [2016-11-15 10:13:09] Will pre-process for website id = 3, period = day, date = last52 +INFO [2016-11-15 10:13:09] - pre-processing all visits +INFO [2016-11-15 10:13:11] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.625s +INFO [2016-11-15 10:13:11] Will pre-process for website id = 3, period = week, date = last260 +INFO [2016-11-15 10:13:11] - pre-processing all visits +INFO [2016-11-15 10:13:33] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 21.601s +INFO [2016-11-15 10:13:33] Will pre-process for website id = 3, period = month, date = last52 +INFO [2016-11-15 10:13:33] - pre-processing all visits +INFO [2016-11-15 10:13:37] Archived website id = 3, period = month, 0 segments, 15 visits in last 52 months, 0 visits this month, Time elapsed: 4.674s +INFO [2016-11-15 10:13:37] Will pre-process for website id = 3, period = year, date = last7 +INFO [2016-11-15 10:13:37] - pre-processing all visits +INFO [2016-11-15 10:13:39] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 1.908s +INFO [2016-11-15 10:13:39] Archived website id = 3, 4 API requests, Time elapsed: 29.813s [3/3 done] +INFO [2016-11-15 10:13:39] Done archiving! +INFO [2016-11-15 10:13:39] --------------------------- +INFO [2016-11-15 10:13:39] SUMMARY +INFO [2016-11-15 10:13:39] Total visits for today across archived websites: 0 +INFO [2016-11-15 10:13:39] Archived today's reports for 3 websites +INFO [2016-11-15 10:13:39] Archived week/month/year for 3 websites +INFO [2016-11-15 10:13:39] Skipped 0 websites +INFO [2016-11-15 10:13:39] - 0 skipped because no new visit since the last script execution +INFO [2016-11-15 10:13:39] - 0 skipped because existing daily reports are less than 150 seconds old +INFO [2016-11-15 10:13:39] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old +INFO [2016-11-15 10:13:39] Total API requests: 24 +INFO [2016-11-15 10:13:39] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 169587 ms, no error +INFO [2016-11-15 10:13:39] Time elapsed: 169.588s +INFO [2016-11-15 10:13:39] --------------------------- +INFO [2016-11-15 10:13:39] SCHEDULED TASKS +INFO [2016-11-15 10:13:39] Starting Scheduled tasks... +INFO [2016-11-15 10:13:39] done +INFO [2016-11-15 10:13:39] ---------------------------
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 2e268537e3..585791ad2b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -1,7 +1,7 @@ All Websites dashboard -label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,ecommerce_revenue,orders_evolution,ecommerce_revenue_evolution -Site 1,11,43,43,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0 -Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0 +label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,nb_conversions_evolution,revenue_evolution,orders_evolution,ecommerce_revenue_evolution +Site 1,11,43,43,$ 0,0,0,$ 0,100%,100%,0%,0%,0,0,0 +Site 2,1,3,3,$ 0,0,0,$ 0,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 @@ -236,42 +236,43 @@ Saturday,1,5,0%,5,00:15:01,0% Sunday,3,7,0%,2.3,00:05:00,67% Actions - Main metrics -nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation -43,27,0,0,0,0,0,0,0.3s +nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords +43,27,0,0,0,0,0,0 Page URLs label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation -/index.htm,9,9,11%,00:05:20,11%,0.3s +index.htm,9,9,11%,00:05:20,11%,0.3s Page URL not defined,9,17,0%,00:00:00,0%,0.22s -/thankyou,8,16,0%,00:04:30,100%,0.31s -/products,1,1,100%,00:00:00,100%,0.15s +thankyou,8,16,0%,00:04:30,100%,0.31s +products,1,1,100%,00:00:00,100%,0.15s Entry pages label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation -/index.htm,9,1,11%,0.3s -/products,1,1,100%,0.15s +index.htm,9,1,11%,0.3s +products,1,1,100%,0.15s Entry page titles label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation -second visitor,8,0,0%,0.25s - first page view,2,2,100%,0.14s +second visitor/two days later/a new visit,8,0,0%,0.32s +first page view,2,2,100%,0.14s Exit pages label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation -/index.htm,9,1,11%,0.3s -/thankyou,8,8,100%,0.31s -/products,1,1,100%,0.15s +index.htm,9,1,11%,0.3s +thankyou,8,8,100%,0.31s +products,1,1,100%,0.15s Exit page titles label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation -Checkout,8,8,100%,0.45s - first page view,2,2,100%,0.14s +Checkout/Purchasing...,8,8,100%,0.45s +first page view,2,2,100%,0.14s Page titles label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation -second visitor,16,16,0%,00:07:30,0%,0.25s -Checkout,8,8,0%,00:00:00,100%,0.45s - first page view,2,2,100%,00:00:00,100%,0.14s +Checkout/Purchasing...,8,8,0%,00:00:00,100%,0.45s +second visitor/two days later/a new visit,8,8,0%,00:06:00,0%,0.32s +second visitor/two days later/second page view,8,8,0%,00:09:00,0%,0.17s +first page view,2,2,100%,00:00:00,100%,0.14s Page Name not defined,1,1,0%,00:00:00,0%,0.22s Site Search Keywords @@ -312,8 +313,8 @@ No data available Referrer Type label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -Websites,6,22,3.7,00:10:01,33%,$ 0 -Campaigns,4,20,5,00:15:01,0%,$ 0 +Websites - referrer.com,6,22,3.7,00:10:01,33%,$ 0 +Campaigns - goal-matching-url-parameter,4,20,5,00:15:01,0%,$ 0 Direct Entry,1,1,1,00:00:00,100%,$ 0 All Referrers @@ -329,14 +330,15 @@ No data available Websites label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -referrer.com,6,22,3.7,00:10:01,33%,$ 0 +referrer.com/Other_Page.htm,4,20,5,00:15:01,0%,$ 0 +referrer.com/page.htm?param=valuewith some spaces,2,2,1,00:00:00,100%,$ 0 Social Networks No data available Campaigns label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -goal-matching-url-parameter,4,20,5,00:15:01,0%,$ 0 +goal-matching-url-parameter - referrer.com,4,20,5,00:15:01,0%,$ 0 Goals nb_conversions,nb_visits_converted,revenue,conversion_rate diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index e5386df4f1..86ed895b2b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -4095,14 +4095,6 @@ 0 </td> </tr> - - <tr style="background-color: rgb(242,242,242);line-height: 22px;"> - <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Avg. generation time </td> - <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.3s - </td> - </tr> </tbody> </table> <br/> @@ -4144,7 +4136,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'> - /index.htm </a> + index.htm </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 9 @@ -4194,7 +4186,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/thankyou'> - /thankyou </a> + thankyou </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 16 @@ -4219,7 +4211,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/products'> - /products </a> + products </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -4275,7 +4267,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'> - /index.htm </a> + index.htm </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 9 @@ -4294,7 +4286,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/products'> - /products </a> + products </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -4343,7 +4335,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 8 </td> @@ -4354,13 +4346,13 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.25s + 0.32s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 </td> @@ -4409,7 +4401,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'> - /index.htm </a> + index.htm </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -4428,7 +4420,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/thankyou'> - /thankyou </a> + thankyou </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 8 @@ -4447,7 +4439,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/products'> - /products </a> + products </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -4496,7 +4488,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 8 </td> @@ -4513,7 +4505,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 </td> @@ -4567,30 +4559,30 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - second visitor </td> + Checkout/Purchasing... </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 16 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 16 + 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:07:30 + 00:00:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.25s + 0.45s </td> </tr> <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Checkout </td> + second visitor/two days later/a new visit </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 8 </td> @@ -4598,22 +4590,45 @@ 8 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:06:00 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 100% + 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0.45s + 0.32s </td> </tr> <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - first page view </td> + second visitor/two days later/second page view </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 8 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 8 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 00:09:00 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0.17s + </td> + </tr> + + <tr style=";line-height: 22px;"> + <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + first page view </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 </td> @@ -4634,7 +4649,7 @@ </td> </tr> - <tr style=";line-height: 22px;"> + <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Page Name not defined </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -4756,7 +4771,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Websites </td> + Websites - referrer.com </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 6 </td> @@ -4779,7 +4794,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Campaigns </td> + Campaigns - goal-matching-url-parameter </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 4 </td> @@ -4955,21 +4970,48 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - referrer.com </td> + <a style="color: rgb(13,13,13);" href='http://referrer.com/Other_Page.htm'> + referrer.com/Other_Page.htm </a> + </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 6 + 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 22 + 20 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 3.7 + 5 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 00:10:01 + 00:15:01 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 33% + 0% + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + $ 0 + </td> + </tr> + + <tr style=";line-height: 22px;"> + <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + <a style="color: rgb(13,13,13);" href='http://referrer.com/page.htm?param=valuewith some spaces'> + referrer.com/page.htm?param=valuewith some spaces </a> + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 00:00:00 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> $ 0 @@ -5020,7 +5062,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - goal-matching-url-parameter </td> + goal-matching-url-parameter - referrer.com </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 4 </td> 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 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 880a4be3a1..1cf639af4f 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 @@ -471,10 +471,10 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0 + 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 0 + $ 250 </td> </tr> </tbody> @@ -600,7 +600,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - ValueIsZero </td> + ValueIsZero - Custom Variable value not defined </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 5 </td> @@ -623,7 +623,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - VisitorType </td> + VisitorType - NewLoggedOut </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 5 </td> @@ -646,7 +646,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - VisitorName </td> + VisitorName - Great name! </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 4 </td> @@ -3981,7 +3981,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'> - /index.htm </a> + index.htm </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 16 @@ -4031,7 +4031,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'> - /index.htm </a> + index.htm </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 4 @@ -4074,7 +4074,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - View product left in cart </td> + View product left in cart </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4088,7 +4088,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - incredible title! </td> + incredible title! </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4102,7 +4102,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Looking at Electronics & Cameras page with a page level custom variable </td> + Looking at Electronics & Cameras page with a page level custom variable </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4145,7 +4145,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://example.org/index.htm'> - /index.htm </a> + index.htm </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 4 @@ -4188,7 +4188,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - View product left in cart </td> + View product left in cart </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 3 </td> @@ -4202,7 +4202,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Another Product page with multiple categories </td> + Another Product page with multiple categories </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4250,7 +4250,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - View product left in cart </td> + View product left in cart </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 9 </td> @@ -4270,7 +4270,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Another Product page </td> + Another Product page </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4290,7 +4290,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Another Product page with multiple categories </td> + Another Product page with multiple categories </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4310,7 +4310,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Another Product page with no category </td> + Another Product page with no category </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4330,7 +4330,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - incredible title! </td> + incredible title! </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4350,7 +4350,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Looking at Electronics & Cameras page again </td> + Looking at Electronics & Cameras page again </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4370,7 +4370,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Looking at Electronics & Cameras page with a page level custom variable </td> + Looking at Electronics & Cameras page with a page level custom variable </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4390,7 +4390,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - Looking at product page </td> + Looking at product page </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 </td> @@ -4656,7 +4656,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 40% + 0% </td> </tr> </tbody> @@ -4978,7 +4978,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 60% + 0% </td> </tr> </tbody> @@ -5298,7 +5298,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 1500 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -5324,7 +5324,7 @@ 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 255.61 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5350,7 +5350,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 100 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 6 @@ -5376,7 +5376,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 100 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5468,7 +5468,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 1500 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1 @@ -5494,7 +5494,7 @@ 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 255.61 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5520,7 +5520,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 100 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 6 @@ -5546,7 +5546,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 100 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5664,7 +5664,7 @@ 3 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 1000 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 1.5 @@ -5690,7 +5690,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 500 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5716,7 +5716,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 500 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5742,7 +5742,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 500 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5768,7 +5768,7 @@ 1 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 500 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5794,7 +5794,7 @@ 4 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 55.61 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 3.5 @@ -5820,7 +5820,7 @@ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - $ 100 + $ 0 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 2 @@ -5906,7 +5906,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 80% + 0% </td> </tr> </tbody> @@ -6307,7 +6307,7 @@ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> Conversion Rate </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 20% + 0% </td> </tr> </tbody> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt index 645d7467c3..a55d80361a 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%)
\ No newline at end of file +week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders. Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250, 1 Goal conversions
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt index f36a23fa6e..4dd544955f 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file +week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders
\ No newline at end of file |