diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
| commit | 4617d4205cdf646a52ef1886d9240e9c2bad0609 (patch) | |
| tree | 849ee39219166830170513e6b00161d3e5864514 /tests/PHPUnit/System | |
| parent | 903b870466b62e8a655a0f6564d052583c0fb7ec (diff) | |
| parent | 5d52b777100f5acb82d16e947e0e9ab2c0804215 (diff) | |
Merge branch '3.x-dev' into 3.0-m06
Conflicts:
js/piwik.min.js
piwik.js
Diffstat (limited to 'tests/PHPUnit/System')
17 files changed, 696 insertions, 67 deletions
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 137e38b598..e29c38ad88 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 @@ -14,17 +14,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 dc8860833a..3d01673888 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 @@ -538,7 +538,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -564,7 +564,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> @@ -589,7 +589,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> @@ -625,7 +625,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -649,7 +649,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> @@ -685,7 +685,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -711,7 +711,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 1129cf1caa..05747a4f62 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -196,8 +196,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> @@ -229,8 +235,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> @@ -262,8 +274,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 188428ebdb..61fc256ebc 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -1538,6 +1538,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> @@ -1552,7 +1636,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -1580,7 +1664,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -1608,7 +1692,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -1636,7 +1720,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2040,6 +2124,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> @@ -2054,7 +2222,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2082,7 +2250,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2110,7 +2278,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2138,7 +2306,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2542,6 +2710,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> @@ -2556,7 +2808,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2584,7 +2836,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2612,7 +2864,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -2640,7 +2892,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3097,6 +3349,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> @@ -3111,7 +3447,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3139,7 +3475,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3167,7 +3503,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3195,7 +3531,7 @@ </subcategory> <module>UserCountry</module> <action>getCity</action> - <order>204</order> + <order>207</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3768,6 +4104,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> @@ -3782,7 +4202,7 @@ </subcategory> <module>UserCountry</module> <action>getCountry</action> - <order>201</order> + <order>204</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3810,7 +4230,7 @@ </subcategory> <module>UserCountry</module> <action>getContinent</action> - <order>202</order> + <order>205</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3838,7 +4258,7 @@ </subcategory> <module>UserCountry</module> <action>getRegion</action> - <order>203</order> + <order>206</order> <parameters> <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> @@ -3866,7 +4286,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 b3855b3029..ad3603d5f9 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 @@ -17,16 +17,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 5a7735b4d9..173df28cda 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 @@ -699,7 +699,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -725,7 +725,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> @@ -761,7 +761,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -785,7 +785,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> @@ -821,7 +821,7 @@ Bounce Rate </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> - Conversion Rate + Revenue </th> </thead> <tbody> @@ -847,7 +847,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> |