From 17d60572dc652a1b4af2a773c3b5d7c8901baf0e Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Tue, 11 Feb 2014 17:53:37 +1300
Subject: [PATCH] Fixes #4503 visitConvertedGoalId now works in all reports.
Note that this also fixes another bug in the Ecommerce items reports!
---
core/Segment.php | 2 +
plugins/Goals/API.php | 15 +++--
.../EcommerceOrderWithItemsTest.php | 4 +-
...ountryIsFr__Goals.getItemsCategory_day.xml | 31 ++++-----
...untryIsFr__Goals.getItemsCategory_week.xml | 31 ++++-----
...entCountryIsFr__Goals.getItemsName_day.xml | 22 +------
...ntCountryIsFr__Goals.getItemsName_week.xml | 24 +------
...mentCountryIsFr__Goals.getItemsSku_day.xml | 15 +----
...entCountryIsFr__Goals.getItemsSku_week.xml | 15 +----
...rlContains__Goals.getItemsCategory_day.xml | 66 +------------------
...lContains__Goals.getItemsCategory_week.xml | 66 +------------------
...ageUrlContains__Goals.getItemsName_day.xml | 30 +--------
...geUrlContains__Goals.getItemsName_week.xml | 30 +--------
...PageUrlContains__Goals.getItemsSku_day.xml | 30 +--------
...ageUrlContains__Goals.getItemsSku_week.xml | 30 +--------
...vertedGoal__Goals.getItemsCategory_day.xml | 12 +++-
...sConvertedGoal__Goals.getItemsName_day.xml | 12 +++-
...asConvertedGoal__Goals.getItemsSku_day.xml | 12 +++-
...ertedGoal1__Goals.getItemsCategory_day.xml | 6 --
...ConvertedGoal1__Goals.getItemsName_day.xml | 6 --
...tConvertedGoal1__Goals.getItemsSku_day.xml | 6 --
21 files changed, 78 insertions(+), 387 deletions(-)
delete mode 100644 tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsCategory_day.xml
delete mode 100644 tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsName_day.xml
delete mode 100644 tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsSku_day.xml
diff --git a/core/Segment.php b/core/Segment.php
index 906a3c139f..b0e7710449 100644
--- a/core/Segment.php
+++ b/core/Segment.php
@@ -346,6 +346,8 @@ class Segment
$join = "log_conversion_item.idvisit = log_visit.idvisit";
} elseif ($conversionItemAvailable && $table === 'log_link_visit_action') {
$join = "log_conversion_item.idvisit = log_link_visit_action.idvisit";
+ } elseif ($conversionItemAvailable && $table === 'log_conversion') {
+ $join = "log_conversion_item.idvisit = log_conversion.idvisit";
} else {
throw new Exception("Table '$table' can't be joined for segmentation");
}
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index ec66a2aec3..63d5d5b100 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -212,7 +212,7 @@ class API extends \Piwik\Plugin\API
$dataTable->filter('Sort', array(Metrics::INDEX_ECOMMERCE_ITEM_REVENUE));
- $this->enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date);
+ $this->enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date, $segment);
// First rename the avg_price_viewed column
$renameColumn = array(self::AVG_PRICE_VIEWED => 'avg_price');
@@ -255,9 +255,9 @@ class API extends \Piwik\Plugin\API
}
}
- protected function enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $idSubtable)
+ protected function enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $segment, $idSubtable)
{
- $ecommerceViews = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = true);
+ $ecommerceViews = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment, $_leavePriceViewedColumn = true);
// For Product names and SKU reports, and for Category report
// Use the Price (tracked on page views)
@@ -513,11 +513,12 @@ class API extends \Piwik\Plugin\API
* @param $idSite
* @param $period
* @param $date
+ * @param $segment
*/
- protected function enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date)
+ protected function enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date, $segment)
{
// Enrich the datatable with Product/Categories views, and conversion rates
- $customVariables = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariables($idSite, $period, $date, $segment = false, $expanded = false,
+ $customVariables = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariables($idSite, $period, $date, $segment, $expanded = false,
$_leavePiwikCoreVariables = true);
$mapping = array(
'Goals_ItemsSku' => '_pks',
@@ -548,7 +549,7 @@ class API extends \Piwik\Plugin\API
$row = $customVariableTableForDate->getRowFromLabel($customVarNameToLookFor);
if ($row) {
$idSubtable = $row->getIdSubDataTable();
- $this->enrichItemsDataTableWithItemsViewMetrics($dataTableForDate, $idSite, $period, $dateRewrite, $idSubtable);
+ $this->enrichItemsDataTableWithItemsViewMetrics($dataTableForDate, $idSite, $period, $dateRewrite, $segment, $idSubtable);
}
$dataTable->addTable($dataTableForDate, $key);
}
@@ -558,7 +559,7 @@ class API extends \Piwik\Plugin\API
$row = $customVariables->getRowFromLabel($customVarNameToLookFor);
if ($row) {
$idSubtable = $row->getIdSubDataTable();
- $this->enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $idSubtable);
+ $this->enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $segment, $idSubtable);
}
$this->renameNotDefinedRow($dataTable, $notDefinedStringPretty);
}
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
index 5f15fb484b..2229f8f787 100755
--- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
+++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -196,8 +196,8 @@ class Test_Piwik_Integration_EcommerceOrderWithItems extends IntegrationTestCase
'idSite' => $idSite,
'date' => $dateTime,
'periods' => array('day'),
- 'segment' => 'visitConvertedGoalId!=1',
- 'testSuffix' => '_SegmentVisitHasNotConvertedGoal1')),
+ 'segment' => 'visitConvertedGoalId==666',
+ 'testSuffix' => '_SegmentNoVisit_HaveConvertedNonExistingGoal')),
// test segment pageTitle
array('VisitsSummary.get', array('idSite' => $idSite, 'date' => $dateTime,
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml
index b19e7a1adf..02187588c4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml
@@ -3,27 +3,9 @@
<row>
<label>Electronics & Cameras</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
- <avg_price>814.37</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Product Category not defined</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <avg_price>710.4</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Category TWO LEFT in cart</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
+ <nb_actions>3</nb_actions>
+ <avg_price>888.56</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
@@ -63,4 +45,13 @@
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
+ <row>
+ <label>Product Category not defined</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <avg_price>888</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml
index 8e6ff0cef1..19944203ad 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml
@@ -1,29 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Product Category not defined</label>
- <nb_visits>4</nb_visits>
- <nb_actions>7</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1376.4</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
<row>
<label>Electronics & Cameras</label>
- <nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>814.37</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Category TWO LEFT in cart</label>
- <nb_visits>3</nb_visits>
+ <nb_visits>2</nb_visits>
<nb_actions>3</nb_actions>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
+ <avg_price>888.56</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
@@ -63,4 +45,13 @@
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
+ <row>
+ <label>Product Category not defined</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_price>888</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml
index 693feff49a..bf093d7b73 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml
@@ -3,27 +3,9 @@
<row>
<label>PRODUCT name</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>5</nb_actions>
- <avg_price>832.78</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>PRODUCT THREE LEFT in cart</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
+ <nb_visits>1</nb_visits>
<nb_actions>4</nb_actions>
- <avg_price>666</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>PRODUCT TWO LEFT in cart</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
+ <avg_price>888.37</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml
index c29832aa42..1adac8c4ec 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml
@@ -1,29 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>PRODUCT THREE LEFT in cart</label>
- <nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1332</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
<row>
<label>PRODUCT name</label>
- <nb_visits>2</nb_visits>
- <nb_actions>5</nb_actions>
+ <nb_visits>1</nb_visits>
+ <nb_actions>4</nb_actions>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_price>832.78</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>PRODUCT TWO LEFT in cart</label>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
+ <avg_price>888.37</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml
index 96d90c4713..db5fcd88f4 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml
@@ -3,18 +3,9 @@
<row>
<label>SKU VERY nice indeed</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>8</nb_actions>
- <avg_price>697.71</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>SKU IN ABANDONED CART TWO</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
+ <nb_visits>1</nb_visits>
+ <nb_actions>3</nb_actions>
+ <avg_price>777</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml
index 5b98174499..6a14444a59 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml
@@ -2,19 +2,10 @@
<result>
<row>
<label>SKU VERY nice indeed</label>
- <nb_visits>4</nb_visits>
- <nb_actions>10</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1363.71</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>SKU IN ABANDONED CART TWO</label>
- <nb_visits>3</nb_visits>
+ <nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <avg_price>777</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml
index b19e7a1adf..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml
@@ -1,66 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Electronics & Cameras</label>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
- <avg_price>814.37</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Product Category not defined</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <avg_price>710.4</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Category TWO LEFT in cart</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 1</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 2</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 4</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 5</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
-</result>
\ No newline at end of file
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml
index 8e6ff0cef1..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml
@@ -1,66 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Product Category not defined</label>
- <nb_visits>4</nb_visits>
- <nb_actions>7</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1376.4</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Electronics & Cameras</label>
- <nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>814.37</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Category TWO LEFT in cart</label>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 4</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>Multiple Category 5</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
-</result>
\ No newline at end of file
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
index 693feff49a..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
@@ -1,30 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>PRODUCT name</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>5</nb_actions>
- <avg_price>832.78</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>PRODUCT THREE LEFT in cart</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <avg_price>666</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>PRODUCT TWO LEFT in cart</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
-</result>
\ No newline at end of file
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
index c29832aa42..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
@@ -1,30 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>PRODUCT THREE LEFT in cart</label>
- <nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1332</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>PRODUCT name</label>
- <nb_visits>2</nb_visits>
- <nb_actions>5</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_price>832.78</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>PRODUCT TWO LEFT in cart</label>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
-</result>
\ No newline at end of file
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml
index 96d90c4713..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml
@@ -1,30 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>SKU VERY nice indeed</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>3</nb_visits>
- <nb_actions>8</nb_actions>
- <avg_price>697.71</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>SKU IN ABANDONED CART TWO</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>SKU2</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <avg_price>1111.11</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
-</result>
\ No newline at end of file
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml
index 5b98174499..c234bed59e 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml
@@ -1,30 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>SKU VERY nice indeed</label>
- <nb_visits>4</nb_visits>
- <nb_actions>10</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1363.71</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>SKU IN ABANDONED CART TWO</label>
- <nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
- <row>
- <label>SKU2</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_price>1111.11</avg_price>
- <avg_quantity>0</avg_quantity>
- <conversion_rate>0%</conversion_rate>
- </row>
-</result>
\ No newline at end of file
+<result />
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_day.xml
index e730ed6fc4..bd9266c196 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_day.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <error message="Table 'log_conversion' can't be joined for segmentation
-
- --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ <row>
+ <label>Electronics & Cameras</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <avg_price>1111.11</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_day.xml
index e730ed6fc4..96520f00d8 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_day.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <error message="Table 'log_conversion' can't be joined for segmentation
-
- --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ <row>
+ <label>PRODUCT name</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <avg_price>1111.11</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_day.xml
index e730ed6fc4..aedefc8bf5 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_day.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <error message="Table 'log_conversion' can't be joined for segmentation
-
- --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
+ <row>
+ <label>SKU2</label>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <avg_price>1111.11</avg_price>
+ <avg_quantity>0</avg_quantity>
+ <conversion_rate>0%</conversion_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsCategory_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsCategory_day.xml
deleted file mode 100644
index e730ed6fc4..0000000000
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsCategory_day.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <error message="Table 'log_conversion' can't be joined for segmentation
-
- --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsName_day.xml
deleted file mode 100644
index e730ed6fc4..0000000000
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsName_day.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <error message="Table 'log_conversion' can't be joined for segmentation
-
- --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsSku_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsSku_day.xml
deleted file mode 100644
index e730ed6fc4..0000000000
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasNotConvertedGoal1__Goals.getItemsSku_day.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <error message="Table 'log_conversion' can't be joined for segmentation
-
- --> To temporarily debug this error further, set const DISPLAY_BACKTRACE_DEBUG=true; in ResponseBuilder.php" />
-</result>
\ No newline at end of file
--
GitLab