diff options
| author | sgiehl <stefan@piwik.org> | 2016-04-10 23:33:04 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:10:59 +0300 |
| commit | 32214677564cb8ce4999098f8cdc2d5d5fd71e2a (patch) | |
| tree | 71619b88859e3ca68ec2a46aec09d99c5fe0cbff | |
| parent | 0b3f3afbbb5cb3134e4b1d257afcec1642da743a (diff) | |
Update test files
19 files changed, 726 insertions, 69 deletions
diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml index 17b74553d8..cf3cc41002 100644 --- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___API.getMetadata_day.xml @@ -27,8 +27,14 @@ <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <revenue>Revenue</revenue> + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Revenue per Visit</revenue_per_visit> + </processedMetricsGoal> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getType&period=day&date=2010-03-06</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getType&period=day&date=2010-02-05,2010-03-06</imageGraphEvolutionUrl> <uniqueId>DevicesDetection_getType</uniqueId> diff --git a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___DevicesDetection.getBrowsers_day.xml b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___DevicesDetection.getBrowsers_day.xml index e2c2f35414..b04af03db4 100644 --- a/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___DevicesDetection.getBrowsers_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test_UserSettingsBCTestUserSettings_UserSettings.getMobileVsDesktop___DevicesDetection.getBrowsers_day.xml @@ -9,7 +9,15 @@ <max_actions>7</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>1</revenue> <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> @@ -73,4 +81,18 @@ <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> + <row> + <label>Unknown</label> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>42</revenue> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 79525cd28c..677272593d 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -119,6 +119,11 @@ class BackwardsCompatibility1XTest extends SystemTestCase // did not exist in Piwik 1.X 'DevicesDetection.getBrowserEngines', + // now enriched with goal metrics + 'DevicesDetection.getType', + 'DevicesDetection.getBrand', + 'DevicesDetection.getModel', + // we test VisitFrequency explicitly 'VisitFrequency.get', diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 0adfc71aee..19c0f325af 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -7,9 +7,18 @@ <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> <bounce_count>31</bounce_count> - <nb_visits_converted>31</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>31</nb_conversions> + <nb_visits_converted>31</nb_visits_converted> + <revenue>155</revenue> + </row> + </goals> + <nb_conversions>31</nb_conversions> + <revenue>155</revenue> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> <segment>deviceBrand==Unknown</segment> </row> @@ -20,7 +29,15 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>10</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> @@ -33,7 +50,15 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Apple.ico</logo> @@ -46,7 +71,15 @@ <max_actions>3</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 6a19338c7d..5b366a921e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -7,9 +7,18 @@ <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> <bounce_count>31</bounce_count> - <nb_visits_converted>31</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>31</nb_conversions> + <nb_visits_converted>31</nb_visits_converted> + <revenue>155</revenue> + </row> + </goals> + <nb_conversions>31</nb_conversions> + <revenue>155</revenue> <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>HTC - Vision</label> @@ -18,7 +27,15 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>2</nb_conversions> + <nb_visits_converted>2</nb_visits_converted> + <revenue>10</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>10</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> @@ -29,7 +46,15 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> @@ -40,7 +65,15 @@ <max_actions>3</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml index 9215886300..4f8796278f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -7,7 +7,15 @@ <max_actions>3</max_actions> <sum_visit_length>549</sum_visit_length> <bounce_count>27</bounce_count> - <nb_visits_converted>30</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>30</nb_conversions> + <nb_visits_converted>30</nb_visits_converted> + <revenue>150</revenue> + </row> + </goals> + <nb_conversions>30</nb_conversions> + <revenue>150</revenue> <sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> <segment>deviceType==desktop</segment> @@ -20,7 +28,15 @@ <max_actions>3</max_actions> <sum_visit_length>2</sum_visit_length> <bounce_count>3</bounce_count> - <nb_visits_converted>4</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>4</nb_conversions> + <nb_visits_converted>4</nb_visits_converted> + <revenue>20</revenue> + </row> + </goals> + <nb_conversions>4</nb_conversions> + <revenue>20</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>deviceType==smartphone</segment> @@ -33,9 +49,18 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>5</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>5</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> + <nb_visits_converted>0</nb_visits_converted> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml index 4cf37854e3..13a8112681 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml @@ -8,7 +8,20 @@ <max_actions>7</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>43</revenue> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> <segment>deviceBrand==Unknown</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml index 050a4cc6c8..aa4fc41878 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml @@ -8,6 +8,19 @@ <max_actions>7</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>43</revenue> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 745f9c6095..643a67f1a7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -8,7 +8,15 @@ <max_actions>7</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>1</revenue> <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> @@ -72,4 +80,18 @@ <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> + <row> + <label>Unknown</label> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>42</revenue> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml index a6ccba6e74..b2ee7881e0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -9,7 +9,20 @@ <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>43</revenue> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> <segment>deviceBrand==Unknown</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml index 302503d00e..0e8f519c31 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml @@ -9,6 +9,19 @@ <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + </goals> + <nb_conversions>2</nb_conversions> + <revenue>43</revenue> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index 6b1fedb0c5..37691b2a89 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -9,7 +9,15 @@ <max_actions>8</max_actions> <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <goals> + <row idgoal='2'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>1</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>1</revenue> <segment>deviceType==desktop</segment> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> @@ -73,4 +81,18 @@ <segment>deviceType==tv</segment> <logo>plugins/DevicesDetection/images/screens/tv.png</logo> </row> + <row> + <label>Unknown</label> + <goals> + <row idgoal='1'> + <nb_conversions>1</nb_conversions> + <nb_visits_converted>1</nb_visits_converted> + <revenue>42</revenue> + </row> + </goals> + <nb_conversions>1</nb_conversions> + <revenue>42</revenue> + <nb_visits>0</nb_visits> + <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml index 9ee74c6530..a8c4567b81 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml @@ -60,7 +60,6 @@ <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> </columns> </metadata> </result>
\ 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 d08c01fa52..98bb5b1b7a 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 @@ -11,17 +11,17 @@ Custom Variables No data available Device type -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,0%,5,00:15:01,0% -Desktop,3,3,0%,1,00:00:00,100% +label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue +Unknown,8,40,5,00:15:01,0%,$ 0 +Desktop,3,3,1,00:00:00,100%,$ 0 Device model -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,11,43,0%,3.9,00:10:55,27% +label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue +Unknown,11,43,3.9,00:10:55,27%,$ 0 Device brand -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,11,43,0%,3.9,00:10:55,27% +label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue +Unknown,11,43,3.9,00:10:55,27%,$ 0 Screen Resolution label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_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 52069c075a..2913ae86e4 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 @@ -528,7 +528,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -554,7 +554,7 @@ 0% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + $ 0 </td> </tr> @@ -579,7 +579,7 @@ 100% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + $ 0 </td> </tr> </tbody> @@ -615,7 +615,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -639,7 +639,7 @@ 27% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + $ 0 </td> </tr> </tbody> @@ -675,7 +675,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -701,7 +701,7 @@ 27% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 0% + $ 0 </td> </tr> </tbody> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 9634ff726a..aeaf8f9c4c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -165,8 +165,14 @@ <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <revenue>Revenue</revenue> + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Revenue per Visit</revenue_per_visit> + </processedMetricsGoal> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getType&period=day&date=2009-01-04</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getType&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> <uniqueId>DevicesDetection_getType</uniqueId> @@ -198,8 +204,14 @@ <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <revenue>Revenue</revenue> + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Revenue per Visit</revenue_per_visit> + </processedMetricsGoal> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> <uniqueId>DevicesDetection_getModel</uniqueId> @@ -231,8 +243,14 @@ <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <revenue>Revenue</revenue> + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Revenue per Visit</revenue_per_visit> + </processedMetricsGoal> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04</imageGraphUrl> <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> <uniqueId>DevicesDetection_getBrand</uniqueId> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index f3518e6424..c883b78231 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -1509,6 +1509,90 @@ <isReport>1</isReport> </row> <row> + <name>Device type</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getType</action> + <order>201</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getType</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>1</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device model</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getModel</action> + <order>202</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getModel</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>1</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device brand</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getBrand</action> + <order>203</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getBrand</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>1</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Country</name> <category> <id>Goals by User location</id> @@ -1523,7 +1607,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -1551,7 +1635,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -1579,7 +1663,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -1607,7 +1691,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2011,6 +2095,90 @@ <isReport>1</isReport> </row> <row> + <name>Device type</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getType</action> + <order>201</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getType</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>2</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device model</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getModel</action> + <order>202</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getModel</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>2</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device brand</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getBrand</action> + <order>203</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getBrand</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>2</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Country</name> <category> <id>Goals by User location</id> @@ -2025,7 +2193,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2053,7 +2221,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2081,7 +2249,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2109,7 +2277,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2513,6 +2681,90 @@ <isReport>1</isReport> </row> <row> + <name>Device type</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getType</action> + <order>201</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getType</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>3</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device model</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getModel</action> + <order>202</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getModel</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>3</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device brand</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getBrand</action> + <order>203</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getBrand</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>3</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Country</name> <category> <id>Goals by User location</id> @@ -2527,7 +2779,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2555,7 +2807,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2583,7 +2835,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2611,7 +2863,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3068,6 +3320,90 @@ <isReport>1</isReport> </row> <row> + <name>Device type</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getType</action> + <order>201</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getType</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>0</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device model</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getModel</action> + <order>202</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getModel</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>0</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device brand</name> + <category> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Goals by User location</id> + <name>Goals by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getBrand</action> + <order>203</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getBrand</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>0</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Country</name> <category> <id>Goals by User location</id> @@ -3082,7 +3418,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3110,7 +3446,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3138,7 +3474,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3166,7 +3502,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3739,6 +4075,90 @@ <isReport>1</isReport> </row> <row> + <name>Device type</name> + <category> + <id>Sales by User location</id> + <name>Sales by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Sales by User location</id> + <name>Sales by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getType</action> + <order>201</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getType</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>ecommerceOrder</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device model</name> + <category> + <id>Sales by User location</id> + <name>Sales by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Sales by User location</id> + <name>Sales by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getModel</action> + <order>202</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getModel</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>ecommerceOrder</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetModelforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Device brand</name> + <category> + <id>Sales by User location</id> + <name>Sales by User location</name> + <order>99</order> + <icon /> + </category> + <subcategory> + <id>Sales by User location</id> + <name>Sales by User location</name> + <order>99</order> + </subcategory> + <module>DevicesDetection</module> + <action>getBrand</action> + <order>203</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>tableGoals</viewDataTable> + <module>DevicesDetection</module> + <action>getBrand</action> + <documentationForGoalsPage>1</documentationForGoalsPage> + <idGoal>ecommerceOrder</idGoal> + </parameters> + <uniqueId>widgetDevicesDetectiongetBrandforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <viewDataTable>tableGoals</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Country</name> <category> <id>Sales by User location</id> @@ -3753,7 +4173,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3781,7 +4201,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3809,7 +4229,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3837,7 +4257,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> 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 ae676d91e9..5807cf5e6a 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 @@ -14,16 +14,16 @@ VisitorType,5,16,$ 13361.11,3.2,00:22:49,20% VisitorName,4,12,$ 13351.11,3,00:25:32,25% Device type -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Desktop,5,16,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +Desktop,5,16,$ 250,3.2,00:22:49,20% Device model -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,5,16,$ 13361.11,3.2,00:22:49,20% Device brand -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,5,16,$ 13361.11,3.2,00:22:49,20% Screen Resolution label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate 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 4f38210ecc..627e468b4b 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 @@ -689,7 +689,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -715,7 +715,7 @@ 20% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 80% + $ 250 </td> </tr> </tbody> @@ -751,7 +751,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -775,7 +775,7 @@ 20% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 80% + $ 13361.11 </td> </tr> </tbody> @@ -811,7 +811,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -837,7 +837,7 @@ 20% </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 80% + $ 13361.11 </td> </tr> </tbody> |