diff --git a/core/ArchiveProcessing/Day.php b/core/ArchiveProcessing/Day.php index a68a56039b542e9a6d0a322a3fe2412cbdf948cb..cb00e5cc4f4b8f11402bf8d7312584a6c9eb225b 100644 --- a/core/ArchiveProcessing/Day.php +++ b/core/ArchiveProcessing/Day.php @@ -574,12 +574,14 @@ class Piwik_ArchiveProcessing_Day extends Piwik_ArchiveProcessing { if(isset($values[Piwik_Archive::INDEX_GOALS])) { - $revenue = $conversions = $nbVisitsConverted = 0; + // When per goal metrics are processed, general 'visits converted' is not meaningful because + // it could differ from the sum of each goal conversions + unset($values[Piwik_Archive::INDEX_NB_VISITS_CONVERTED]); + $revenue = $conversions = 0; foreach($values[Piwik_Archive::INDEX_GOALS] as $idgoal => $goalValues) { $revenue += $goalValues[Piwik_Archive::INDEX_GOAL_REVENUE]; $conversions += $goalValues[Piwik_Archive::INDEX_GOAL_NB_CONVERSIONS]; - $nbVisitsConverted += $goalValues[Piwik_Archive::INDEX_GOAL_NB_VISITS_CONVERTED]; } $values[Piwik_Archive::INDEX_NB_CONVERSIONS] = $conversions; $values[Piwik_Archive::INDEX_REVENUE] = $revenue; diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php index 8a04c48a84de381ce3d484e99646b1db6b5d3717..22b45f462c9777ac684b4d5ce54c3fe0002da6a5 100644 --- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php +++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php @@ -45,17 +45,13 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetrics extends Piwik_DataTable_ $rowsIdToDelete[] = $key; continue; } - + $nbVisitsConverted = (int)$this->getColumn($row, Piwik_Archive::INDEX_NB_VISITS_CONVERTED); - if($nbVisitsConverted == 0) - { - $conversionRate = $this->invalidDivision; - } - else + if($nbVisitsConverted != 0) { $conversionRate = round(100 * $nbVisitsConverted / $nbVisits, $this->roundPrecision); + $row->addColumn('conversion_rate', $conversionRate."%"); } - $row->addColumn('conversion_rate', $conversionRate."%"); if($nbVisits == 0) { diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php index f177d49a02bf0b4b5ee374296e5c4d9cfd11f66c..eb4359437e55d0183036bcba54cd8471af0ff4fd 100644 --- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php +++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php @@ -61,6 +61,7 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal extends Piwik_DataTa parent::filter($table); $roundingPrecision = 2; $expectedColumns = array(); + foreach($table->getRows() as $key => $row) { $currentColumns = $row->getColumns(); @@ -72,8 +73,16 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal extends Piwik_DataTa $goals = $this->getColumn($currentColumns, Piwik_Archive::INDEX_GOALS); if($goals) { - $revenue = (int)$this->getColumn($currentColumns, Piwik_Archive::INDEX_REVENUE); - + $revenue = 0; + foreach($goals as $goalId => $columnValue) + { + $revenue += (int)$this->getColumn($columnValue, Piwik_Archive::INDEX_GOAL_REVENUE, Piwik_Archive::$mappingFromIdToNameGoal); + } + + if($revenue == 0) + { + $revenue = (int)$this->getColumn($currentColumns, Piwik_Archive::INDEX_REVENUE); + } // If no visit for this metric, but some conversions, we still want to display some kind of "revenue per visit" // even though it will actually be in this edge case "Revenue per conversion" $revenuePerVisit = $this->invalidDivision; diff --git a/core/DataTable/Renderer/Html.php b/core/DataTable/Renderer/Html.php index e58ace3dfb608447f85c9c65192df29f0b023762..db8ca16b78e7049810a6aa7f4eefdac368ae3230 100644 --- a/core/DataTable/Renderer/Html.php +++ b/core/DataTable/Renderer/Html.php @@ -151,7 +151,14 @@ class Piwik_DataTable_Renderer_Html extends Piwik_DataTable_Renderer $value = "-"; if(isset($row[$name])) { - $value = self::formatValueXml($row[$name]); + if(is_array($row[$name])) + { + $value = "<pre>".self::formatValueXml(var_export($row[$name], true)) . "</pre>"; + } + else + { + $value = self::formatValueXml($row[$name]); + } } $html .= "\t\t<td>$value</td>\n"; diff --git a/core/ViewDataTable/HtmlTable/AllColumns.php b/core/ViewDataTable/HtmlTable/AllColumns.php index fbc5f49712c903b7a5f3c8de8c4bcebb83eaf658..3c1ea0a846c03bdba4ec739769ea819fefd275b7 100644 --- a/core/ViewDataTable/HtmlTable/AllColumns.php +++ b/core/ViewDataTable/HtmlTable/AllColumns.php @@ -42,13 +42,22 @@ class Piwik_ViewDataTable_HtmlTable_AllColumns extends Piwik_ViewDataTable_HtmlT { $columnUniqueVisitors = 'nb_uniq_visitors'; } + + // only display conversion rate for the plugins that do not provide "per goal" metrics + // otherwise, conversion rate is meaningless as a whole (since we don't process 'cross goals' conversions) + $columnConversionRate = false; + if(empty($this->viewProperties['show_goals'])) + { + $columnConversionRate = 'conversion_rate'; + } $this->setColumnsToDisplay(array('label', 'nb_visits', $columnUniqueVisitors, 'nb_actions_per_visit', 'avg_time_on_site', 'bounce_rate', - 'conversion_rate')); + $columnConversionRate + )); $this->dataTable->filter('ColumnCallbackReplace', array('avg_time_on_site', create_function('$averageTimeOnSite', 'return Piwik::getPrettyTimeFromSeconds($averageTimeOnSite);'))); } } diff --git a/core/ViewDataTable/HtmlTable/Goals.php b/core/ViewDataTable/HtmlTable/Goals.php index 5f346afba28261f1b6f6948472f20c3d66f362b8..1225044d909ddb0793f76af6bc70cb8f41110abd 100644 --- a/core/ViewDataTable/HtmlTable/Goals.php +++ b/core/ViewDataTable/HtmlTable/Goals.php @@ -46,7 +46,6 @@ class Piwik_ViewDataTable_HtmlTable_Goals extends Piwik_ViewDataTable_HtmlTable 'goal_%s_conversion_rate', 'goal_%s_revenue_per_visit', - 'conversion_rate', 'revenue_per_visit', )); diff --git a/plugins/API/API.php b/plugins/API/API.php index 71daf6280c3784ac1a9b2c2e239baa832822f6de..deb95be512843b96d4aadf4f6d82cb88b3607a20 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -312,6 +312,12 @@ class Piwik_API_API unset($availableReport[$attributeName]); } } + // when there are per goal metrics, don't display conversion_rate since it can differ from per goal sum + if(isset($availableReport['metricsGoal'])) + { + unset($availableReport['processedMetrics']['conversion_rate']); + unset($availableReport['metricsGoal']['conversion_rate']); + } // Processing a uniqueId for each report, // can be used by UIs as a key to match a given report @@ -467,8 +473,7 @@ class Piwik_API_API // Display the global Goal metrics if(isset($reportMetadata['metricsGoal'])) { - $metricsGoalDisplay = array('conversion_rate', 'revenue'); - + $metricsGoalDisplay = array('revenue'); // Add processed metrics to be displayed for this report foreach($metricsGoalDisplay as $goalMetricId) { @@ -478,13 +483,6 @@ class Piwik_API_API } } } - if(isset($reportMetadata['metricsGoal'])) - { - // To process conversion_rate, we need to apply the Goal processed filter - // only requesting to process the basic metrics - // This adds goal metrics as well as standard metrics - $dataTable->filter('AddColumnsProcessedMetricsGoal', array($enable=true, Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_MINIMAL_REPORT)); - } elseif(isset($reportMetadata['processedMetrics'])) { // Add processed metrics diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php index f44a1faa32af32075e6b8853808e9bd13374a374..d56a8208f298313b97621f5bc10c2e372d419460 100644 --- a/plugins/Referers/Controller.php +++ b/plugins/Referers/Controller.php @@ -157,10 +157,9 @@ class Piwik_Referers_Controller extends Piwik_Controller 'Referers.getCampaigns', 'getKeywordsFromCampaignId' ); - $view->disableExcludeLowPopulation(); $view->enableShowGoals(); - $view->setLimit( 5 ); + $view->setLimit( 10 ); $view->setColumnsToDisplay( array('label','nb_visits') ); $view->setColumnTranslation('label', Piwik_Translate('Referers_ColumnCampaign')); return $this->renderView($view, $fetch); diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml index e107afdf9ab5ed251ba4efa3ce3cee836ff2d4d3..e5e6ad0926e2e3afcdf3b59298c546dedf80e7f7 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getKeywords_day.xml @@ -8,7 +8,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml index 1c4baf6ea228526ea41ffe7eddf22f9c3b60d7f6..11a77e877454590b95d52c6942fb9c4565ad67b8 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -27,7 +26,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml index cdfe1025f7e3a2ac97c5687abf23f15040b9e295..ebb9a7a4adcd33b6572e2a70f4500d89b8409da5 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getSearchEngines_day.xml @@ -8,7 +8,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml index cb6b10d728a8c738385a3d6bc1ab09eb7d990e95..2ec8b7bbe4c5e47a5fd24a2f7283f622315f5ce9 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml index 549943c92a0bc51281f64cd95c4f7f0b3aea2a5e..e2695dfa99df802d29dae1176852b9212df2ab2f 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index 34280be7695b10363db9a646c0ec11c09564f45f..9ccfa8421a4de0788a2738bc56cf71c82a049c0b 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml index c38cdd91f5f3c58a7e6f5bf165a1511dde835087..a34da03d5b5afbe671f66a395561de7f0e893fab 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml @@ -118,7 +118,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -137,7 +136,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getKeywords_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getKeywords_day.xml index e107afdf9ab5ed251ba4efa3ce3cee836ff2d4d3..e5e6ad0926e2e3afcdf3b59298c546dedf80e7f7 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getKeywords_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getKeywords_day.xml @@ -8,7 +8,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml index 1c4baf6ea228526ea41ffe7eddf22f9c3b60d7f6..11a77e877454590b95d52c6942fb9c4565ad67b8 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -27,7 +26,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getSearchEngines_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getSearchEngines_day.xml index cdfe1025f7e3a2ac97c5687abf23f15040b9e295..ebb9a7a4adcd33b6572e2a70f4500d89b8409da5 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getSearchEngines_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getSearchEngines_day.xml @@ -8,7 +8,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml index cb6b10d728a8c738385a3d6bc1ab09eb7d990e95..2ec8b7bbe4c5e47a5fd24a2f7283f622315f5ce9 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml index 549943c92a0bc51281f64cd95c4f7f0b3aea2a5e..e2695dfa99df802d29dae1176852b9212df2ab2f 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index 34280be7695b10363db9a646c0ec11c09564f45f..9ccfa8421a4de0788a2738bc56cf71c82a049c0b 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -8,7 +8,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml index c38cdd91f5f3c58a7e6f5bf165a1511dde835087..a34da03d5b5afbe671f66a395561de7f0e893fab 100644 --- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml @@ -118,7 +118,6 @@ <max_actions>5</max_actions> <sum_visit_length>1620</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -137,7 +136,6 @@ <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='2'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referers.getCampaigns_day.xml b/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referers.getCampaigns_day.xml index 7b05f043f917d7bf52b53baec5b4d22b85483ac1..9b6c31b0559b7e019456bb29f2d10a8588f030a8 100644 --- a/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referers.getCampaigns_day.xml +++ b/tests/integration/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Referers.getCampaigns_day.xml @@ -8,7 +8,6 @@ <max_actions>1</max_actions> <sum_visit_length>1080</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -27,7 +26,6 @@ <max_actions>1</max_actions> <sum_visit_length>1080</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_apiGetReportMetadata__API.getMetadata_day.xml b/tests/integration/expected/test_apiGetReportMetadata__API.getMetadata_day.xml index 1c8ffd506bd7829467ccfafdcbc8a5f399db4e6b..b26dfe54ef2381be3f716e60da92b952530e21f0 100644 --- a/tests/integration/expected/test_apiGetReportMetadata__API.getMetadata_day.xml +++ b/tests/integration/expected/test_apiGetReportMetadata__API.getMetadata_day.xml @@ -16,12 +16,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> diff --git a/tests/integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 5bbb25e2ab67dc8a5b05c39fbbde88facdce2752..68d5baa5cb02fcf25a2c1bf718eb2b2286613f09 100644 --- a/tests/integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -18,12 +18,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -42,7 +40,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> <revenue>Revenue</revenue> </columns> @@ -53,10 +50,9 @@ <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <revenue>$ 42.25</revenue> - <conversion_rate>100%</conversion_rate> - <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>00:18:00</avg_time_on_site> - <bounce_rate>100%</bounce_rate> + <nb_actions_per_visit>0</nb_actions_per_visit> + <avg_time_on_site>00:00:00</avg_time_on_site> + <bounce_rate>0</bounce_rate> </row> diff --git a/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml b/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml index 67902ed5a396db02f6e36b34e91cd25e1bc1b126..8f1a8bc9f28eb0e19446dfea34754ea8502f8fc8 100644 --- a/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml +++ b/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml @@ -34,12 +34,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -154,12 +152,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -186,12 +182,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -218,12 +212,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -250,12 +242,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -282,12 +272,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -328,12 +316,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -360,12 +346,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -392,12 +376,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> diff --git a/tests/integration/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml b/tests/integration/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml index defc7a3adaf5d121f793ad7ffd76e8e7d52a23ca..b3167cf4bfffdb21e37709164d028c9cb3415e28 100644 --- a/tests/integration/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml +++ b/tests/integration/expected/test_apiGetReportMetadata_year__API.getProcessedReport_year.xml @@ -17,12 +17,10 @@ <nb_actions_per_visit>Actions par visite</nb_actions_per_visit> <avg_time_on_site>Temps moyen sur le site</avg_time_on_site> <bounce_rate>Taux de rebond</bounce_rate> - <conversion_rate>Taux de conversion</conversion_rate> </processedMetrics> <metricsGoal> <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Taux de conversion</conversion_rate> <revenue>Revenu</revenue> </metricsGoal> @@ -40,7 +38,6 @@ <nb_actions_per_visit>Actions par visite</nb_actions_per_visit> <avg_time_on_site>Temps moyen sur le site</avg_time_on_site> <bounce_rate>Taux de rebond</bounce_rate> - <conversion_rate>Taux de conversion</conversion_rate> <revenue>Revenu</revenue> </columns> diff --git a/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml b/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml index 67902ed5a396db02f6e36b34e91cd25e1bc1b126..8f1a8bc9f28eb0e19446dfea34754ea8502f8fc8 100644 --- a/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml +++ b/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml @@ -34,12 +34,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -154,12 +152,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -186,12 +182,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -218,12 +212,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -250,12 +242,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -282,12 +272,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -328,12 +316,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -360,12 +346,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -392,12 +376,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index a038090b134e9d1444ccbf2d12ef85d79a8c4f43..920f2a61f85ffbce86742153749e609642c4ed94 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <website>Piwik test</website> - <prettyDate>29 Mar 11 - 4 Apr 11</prettyDate> + <prettyDate>14 Apr 11 - 20 Apr 11</prettyDate> <metadata> <category>Visitors</category> <name>Country</name> @@ -17,12 +17,10 @@ <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> - <conversion_rate>Conversion Rate</conversion_rate> <revenue>Revenue</revenue> </metricsGoal> @@ -40,7 +38,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> <revenue>Revenue</revenue> </columns> @@ -50,10 +47,9 @@ <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> <revenue>$ 1000</revenue> - <conversion_rate>66.67%</conversion_rate> - <nb_actions_per_visit>1.67</nb_actions_per_visit> - <avg_time_on_site>00:04:00</avg_time_on_site> - <bounce_rate>66.67%</bounce_rate> + <nb_actions_per_visit>0</nb_actions_per_visit> + <avg_time_on_site>00:00:00</avg_time_on_site> + <bounce_rate>0</bounce_rate> </row> diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml index f34f6f336be0fd11378b92a988b066e6fbbdb783..56137d95934cebb00cc276103b5cfa2628d5ed88 100644 --- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml +++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml @@ -24,7 +24,6 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -43,7 +42,6 @@ <max_actions>3</max_actions> <sum_visit_length>720</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -81,7 +79,6 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml index 1f2965208e8c424020f2374b37b970cc47a9d1e4..bef4ab0879eee9d616f3a06e8b7d412ff94a0caf 100644 --- a/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/integration/expected/test_trackGoals_allowMultipleConversionsPerVisit__VisitTime.getVisitInformationPerServerTime_day.xml @@ -8,7 +8,6 @@ <max_actions>1</max_actions> <sum_visit_length>1116</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml index a50f45c03d69d2042a89655b34f66d9f7ebb3a28..ba7c8d4ada172e7eae8171813ce1d04922e93632 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml @@ -27,7 +27,6 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -46,7 +45,6 @@ <max_actions>3</max_actions> <sum_visit_length>720</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -84,7 +82,6 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml index 45a6bc166383d9af8854d05b9d99c322ccbc00ab..0ff0f8a8a965e984ea1d40b1e7b25d2351195ba3 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml @@ -26,7 +26,6 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -45,7 +44,6 @@ <max_actions>3</max_actions> <sum_visit_length>720</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -83,7 +81,6 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml index dc0801f5b98517f24a91767ed48b9fac6217e2f3..9a1feff2f40317e5a2a1bc28abb01e9337b9a39b 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml @@ -27,7 +27,6 @@ <max_actions>3</max_actions> <sum_visit_length>720</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml index db4628e5b952f41c9121c6b4357566049ad75e8c..15d09c4946ae0026faca8749b9f8da51b9a73413 100644 --- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml +++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml @@ -26,7 +26,6 @@ <max_actions>3</max_actions> <sum_visit_length>720</sum_visit_length> <bounce_count>0</bounce_count> - <nb_visits_converted>1</nb_visits_converted> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions>