diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-10-13 08:54:05 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-10-13 08:54:05 +0400 |
| commit | b58efe50ec74ec5f12eb27b5f815b65011af2c68 (patch) | |
| tree | 4aa4959cc4488e06928e9f7c9a5030c6e9f3300a | |
| parent | fbe119f647d2f11f1c0e0908e9ba118dfead096f (diff) | |
Fixes #6191 Make sure Goal URL matching uses the RAW URL including any excluded URL parameters. + tests
32 files changed, 429 insertions, 370 deletions
diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php index 6df6f64cfc..23372538ac 100644 --- a/core/Tracker/Action.php +++ b/core/Tracker/Action.php @@ -64,9 +64,18 @@ abstract class Action private $actionIdsCached = array(); private $actionName; private $actionType; + + /** + * URL with excluded Query parameters + */ private $actionUrl; /** + * Raw URL (will contain excluded URL query parameters) + */ + private $rawActionUrl; + + /** * Makes the correct Action object based on the request. * * @param Request $request @@ -145,6 +154,14 @@ abstract class Action return $this->actionUrl; } + /** + * Returns URL of page being tracked, including all original Query parameters + */ + public function getActionUrlRaw() + { + return $this->rawActionUrl; + } + public function getActionName() { return $this->actionName; @@ -173,15 +190,15 @@ abstract class Action protected function setActionUrl($url) { - $urlBefore = $url; + $this->rawActionUrl = PageUrl::getUrlIfLookValid($url); $url = PageUrl::excludeQueryParametersFromUrl($url, $this->request->getIdSite()); - if ($url != $urlBefore) { - Common::printDebug(' Before was "' . $urlBefore . '"'); + $this->actionUrl = PageUrl::getUrlIfLookValid($url); + + if ($url != $this->rawActionUrl) { + Common::printDebug(' Before was "' . $this->rawActionUrl . '"'); Common::printDebug(' After is "' . $url . '"'); } - - $this->actionUrl = PageUrl::getUrlIfLookValid($url); } abstract protected function getActionsToLookup(); diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index 69639fd1c6..27b3a6f48c 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -153,7 +153,6 @@ class GoalManager return false; } - $decodedActionUrl = $action->getActionUrl(); $actionType = $action->getActionType(); $goals = $this->getGoalDefinitions($idSite); @@ -169,7 +168,6 @@ class GoalManager continue; } - $url = $decodedActionUrl; switch ($attribute) { case 'title': @@ -185,13 +183,17 @@ class GoalManager case 'event_category': $url = $action->getEventCategory(); break; + // url, external_website, file, manually... + default: + $url = $action->getActionUrlRaw(); + break; } $pattern_type = $goal['pattern_type']; $match = $this->isUrlMatchingGoal($goal, $pattern_type, $url); if ($match) { - $goal['url'] = $decodedActionUrl; + $goal['url'] = $action->getActionUrl(); $this->convertedGoals[] = $goal; } } diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 316fc83e8f932001f9038098f4601aa17f1ee53 +Subproject 05d5a2a3aceb5bfcffdbdf5cf33e6b031a998a3 diff --git a/plugins/Goals/tests/Integration/APITest.php b/plugins/Goals/tests/Integration/APITest.php index 8f64117039..a4e850a51f 100644 --- a/plugins/Goals/tests/Integration/APITest.php +++ b/plugins/Goals/tests/Integration/APITest.php @@ -50,9 +50,9 @@ class APITest extends IntegrationTestCase public function test_addGoal_shouldSucceed_IfOnlyMinimumFieldsGiven() { - $idGoal = $this->api->addGoal($this->idSite, 'MyName', 'url', 'http://www.test.de', 'exact'); + $idGoal = $this->api->addGoal($this->idSite, 'MyName', 'url', 'http://www.test.de/?pk_campaign=1', 'exact'); - $this->assertGoal($idGoal, 'MyName', 'url', 'http://www.test.de', 'exact', 0, 0, 0); + $this->assertGoal($idGoal, 'MyName', 'url', 'http://www.test.de/?pk_campaign=1', 'exact', 0, 0, 0); } public function test_addGoal_ShouldSucceed_IfAllFieldsGiven() diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php index 8ccf2c6b8c..0281ac532e 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php +++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php @@ -24,6 +24,8 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture public $dateTime = '2010-01-03 11:22:33'; public $allowConversions = false; + const URL_IS_GOAL_WITH_CAMPAIGN_PARAMETERS = 'http://example.org/index.htm?pk_campaign=goal-matching-url-parameter'; + public function setUp() { @@ -58,6 +60,9 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture if (!self::goalExists($idSite = 1, $idGoal = 2)) { APIGoals::getInstance()->addGoal($this->idSite2, 'all', 'url', 'http', 'contains'); } + if (!self::goalExists($idSite = 1, $idGoal = 3)) { + APIGoals::getInstance()->addGoal($this->idSite1, 'matching URL with campaign parameter', 'url', self::URL_IS_GOAL_WITH_CAMPAIGN_PARAMETERS, 'contains'); + } } APISitesManager::getInstance()->updateSite( @@ -88,7 +93,7 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture */ private function trackVisitsSite1($idSite, $dateTime) { -// - + // - // First visitor on Idsite 1: two page views $datetimeSpanOverTwoDays = '2010-01-03 23:55:00'; $visitorA = self::getTracker($idSite, $datetimeSpanOverTwoDays, $defaultInit = true); @@ -131,7 +136,12 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture $visitorB->DEBUG_APPEND_URL .= '&_idvc=2&_viewts=' . Date::factory($dateTime)->getTimestamp(); $visitorB->setUrlReferrer('http://referrer.com/Other_Page.htm'); - $visitorB->setUrl('http://example.org/index.htm'); + if( in_array($days, array(2,3,4,$daysToGenerateVisitsFor-1)) ) { + $visitorB->setUrl( self::URL_IS_GOAL_WITH_CAMPAIGN_PARAMETERS ); + } else { + $visitorB->setUrl('http://example.org/index.htm'); + } + $visitorB->setGenerationTime(323); self::assertTrue($visitorB->doTrackPageView('second visitor/two days later/a new visit')); // Second page view 6 minutes later diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php index 0676950dc8..ae4c167010 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php @@ -14,6 +14,7 @@ use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; * Tests IndexedBySite optimizations when archiving is disabled. * * @group TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest + * @group TwoSitesTwoVisitorsDifferentDays * @group Plugins */ class TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest extends SystemTestCase diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php index 3d9c595367..9918f108d9 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php @@ -18,6 +18,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/Goals/Goals.php'; * on every url. * * @group TwoVisitorsTwoWebsitesDifferentDaysConversionsTest + * @group TwoSitesTwoVisitorsDifferentDays * @group Plugins */ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase @@ -57,27 +58,40 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase 'year' ); - $result = array( - // Request data for the last 6 periods and idSite=all - array($apiToCall, array('idSite' => 'all', + $result = array(); + + // Live output for a quick visualisation if some other API test break + $result[] = array( + 'Live.getLastVisitsDetails', array( + 'idSite' => self::$fixture->idSite1, + 'date' => $dateTime, + 'periods' => 'year', + 'keepLiveDates' => true, + 'otherRequestParameters' => array('showColumns' => 'lastActionDateTime,referrerType,referrerName,actions,events,visitConverted'), + )); + + // Request data for the last 6 periods and idSite=all + $result[] = array($apiToCall, array('idSite' => 'all', 'date' => $dateTime, 'periods' => $periods, - 'setDateLastN' => true)), + 'setDateLastN' => true + )); - // Request data for the last 6 periods and idSite=1 - array($apiToCall, array('idSite' => $idSite1, + // Request data for the last 6 periods and idSite=1 + $result[] = array($apiToCall, array('idSite' => $idSite1, 'date' => $dateTime, 'periods' => $periods, 'setDateLastN' => true, - 'testSuffix' => '_idSiteOne_')), + 'testSuffix' => '_idSiteOne_' + )); - // We also test a single period to check that this use case (Reports per idSite in the response) works - array($singlePeriodApi, array('idSite' => 'all', + // We also test a single period to check that this use case (Reports per idSite in the response) works + $result[] = array($singlePeriodApi, array('idSite' => 'all', 'date' => $dateTime, 'periods' => array('day', 'month'), 'setDateLastN' => false, - 'testSuffix' => '_NotLastNPeriods')), - ); + 'testSuffix' => '_NotLastNPeriods' + )); // testing metadata API for multiple periods $apiToCall = array_diff($apiToCall, array('Actions.getPageTitle', 'Actions.getPageUrl')); @@ -97,15 +111,16 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase // Tests that getting a visits summary metric (nb_visits) & a Goal's metric (Goal_revenue) // at the same time works. - $dateTime = '2010-01-03,2010-01-06'; + $dateTimeRange = '2010-01-03,2010-01-06'; $columns = 'nb_visits,' . Archiver::getRecordName('conversion_rate'); $result[] = array( - 'VisitsSummary.get', array('idSite' => 'all', 'date' => $dateTime, 'periods' => 'range', + 'VisitsSummary.get', array('idSite' => 'all', 'date' => $dateTimeRange, 'periods' => 'range', 'otherRequestParameters' => array('columns' => $columns), 'testSuffix' => '_getMetricsFromDifferentReports') ); + return $result; } diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php index 65ce66105e..c9fd4f04c5 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php @@ -20,6 +20,7 @@ use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; * Also testing metadata API for multiple periods * * @group TwoVisitorsTwoWebsitesDifferentDaysTest + * @group TwoSitesTwoVisitorsDifferentDays * @group Plugins */ class TwoVisitorsTwoWebsitesDifferentDaysTest extends SystemTestCase diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml index 5518322f9d..9c1be3f18a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml @@ -114,7 +114,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -191,7 +191,7 @@ </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -268,7 +268,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> <revenue>$ 0</revenue> </row> <row> @@ -472,6 +472,6 @@ <result prettyDate="Saturday 9 January 2010" /> </reportMetadata> <reportTotal> - <nb_conversions>7</nb_conversions> + <nb_conversions>10</nb_conversions> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml index b22657ae32..5c85081c9f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_NotLastNPeriods__Goals.get_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> - <nb_conversions>10</nb_conversions> + <nb_conversions>14</nb_conversions> <nb_visits_converted>10</nb_visits_converted> <conversion_rate>100</conversion_rate> <revenue>50</revenue> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml index 6812efd47b..c12a5b867e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml @@ -71,7 +71,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> @@ -133,7 +133,7 @@ </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> @@ -195,7 +195,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml index ea5ebdc416..79e8e68078 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml @@ -12,15 +12,15 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> @@ -36,7 +36,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>3</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml index e64f82133c..4e94bf1235 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml @@ -70,15 +70,15 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> @@ -152,7 +152,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>3</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml index aec231ccd9..722b21fb93 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml @@ -12,15 +12,15 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> @@ -36,7 +36,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>3</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml index 3028f63bd5..4bd8b6ee02 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml @@ -70,7 +70,7 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> @@ -132,7 +132,7 @@ </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> @@ -194,7 +194,7 @@ </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml index 4c4cde2aaa..0ca4a8164c 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml @@ -11,15 +11,15 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> @@ -35,7 +35,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>3</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml index d14e5969a6..1ec94ed921 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml @@ -69,15 +69,15 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> @@ -151,7 +151,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>3</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml index 5b7b43f93c..0d681eaadd 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml @@ -11,15 +11,15 @@ </row> <row> <label>2 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>3 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>4 days</label> - <nb_conversions>1</nb_conversions> + <nb_conversions>2</nb_conversions> </row> <row> <label>5 days</label> @@ -35,7 +35,7 @@ </row> <row> <label>8-14 days</label> - <nb_conversions>2</nb_conversions> + <nb_conversions>3</nb_conversions> </row> <row> <label>15-30 days</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index b44b46c790..eb3f03db1b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -64,45 +64,9 @@ <revenue>$ 0</revenue> </row> </result> - <result prettyDate="Tuesday 5 January 2010"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <nb_actions_per_visit>5</nb_actions_per_visit> - <avg_time_on_site>00:15:01</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <revenue>$ 0</revenue> - </row> - </result> - <result prettyDate="Wednesday 6 January 2010"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <nb_actions_per_visit>5</nb_actions_per_visit> - <avg_time_on_site>00:15:01</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <revenue>$ 0</revenue> - </row> - </result> - <result prettyDate="Thursday 7 January 2010"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <nb_actions_per_visit>5</nb_actions_per_visit> - <avg_time_on_site>00:15:01</avg_time_on_site> - <bounce_rate>0%</bounce_rate> - <revenue>$ 0</revenue> - </row> - </result> + <result prettyDate="Tuesday 5 January 2010" /> + <result prettyDate="Wednesday 6 January 2010" /> + <result prettyDate="Thursday 7 January 2010" /> <result prettyDate="Friday 8 January 2010"> <row> <label>referrer.com</label> @@ -137,21 +101,9 @@ </row> </result> - <result prettyDate="Tuesday 5 January 2010"> - <row> - - </row> - </result> - <result prettyDate="Wednesday 6 January 2010"> - <row> - - </row> - </result> - <result prettyDate="Thursday 7 January 2010"> - <row> - - </row> - </result> + <result prettyDate="Tuesday 5 January 2010" /> + <result prettyDate="Wednesday 6 January 2010" /> + <result prettyDate="Thursday 7 January 2010" /> <result prettyDate="Friday 8 January 2010"> <row> @@ -164,9 +116,9 @@ </result> </reportMetadata> <reportTotal> - <nb_visits>6</nb_visits> - <nb_uniq_visitors>6</nb_uniq_visitors> - <nb_actions>27</nb_actions> + <nb_visits>3</nb_visits> + <nb_uniq_visitors>3</nb_uniq_visitors> + <nb_actions>12</nb_actions> <nb_visits_converted>0</nb_visits_converted> <bounce_count>0</bounce_count> </reportTotal> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml index 03e010ff91..fa36e9ed05 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml @@ -28,84 +28,9 @@ </subtable> </row> </result> - <result date="2010-01-05"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <subtable> - <row> - <label>http://referrer.com/Other_Page.htm</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - </subtable> - </row> - </result> - <result date="2010-01-06"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <subtable> - <row> - <label>http://referrer.com/Other_Page.htm</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - </subtable> - </row> - </result> - <result date="2010-01-07"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <subtable> - <row> - <label>http://referrer.com/Other_Page.htm</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - </subtable> - </row> - </result> + <result date="2010-01-05" /> + <result date="2010-01-06" /> + <result date="2010-01-07" /> <result date="2010-01-08"> <row> <label>referrer.com</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml index aae3dbad27..40af378380 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml @@ -4,24 +4,24 @@ <result date="2010-01"> <row> <label>referrer.com</label> - <nb_visits>9</nb_visits> - <nb_actions>42</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>22</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7569</sum_visit_length> + <sum_visit_length>3965</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>8</nb_visits> - <nb_actions>40</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>20</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7208</sum_visit_length> + <sum_visit_length>3604</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml index 1ba3ef39a1..936d04f579 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml @@ -5,24 +5,24 @@ <result date="From 2010-01-04 to 2010-01-10"> <row> <label>referrer.com</label> - <nb_visits>7</nb_visits> - <nb_actions>32</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>17</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>5767</sum_visit_length> + <sum_visit_length>3064</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>6</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>3</nb_visits> + <nb_actions>15</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>5406</sum_visit_length> + <sum_visit_length>2703</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -42,24 +42,24 @@ <result date="From 2010-01-11 to 2010-01-17"> <row> <label>referrer.com</label> - <nb_visits>2</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>5</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1802</sum_visit_length> + <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>2</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>5</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1802</sum_visit_length> + <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> </subtable> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml index 81caacb06a..fec8a07c30 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml @@ -4,24 +4,24 @@ <result date="2010"> <row> <label>referrer.com</label> - <nb_visits>9</nb_visits> - <nb_actions>42</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>22</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7569</sum_visit_length> + <sum_visit_length>3965</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>8</nb_visits> - <nb_actions>40</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>20</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7208</sum_visit_length> + <sum_visit_length>3604</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml index 1a10c7ba69..26f579966b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml @@ -27,84 +27,9 @@ </subtable> </row> </result> - <result date="2010-01-05"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <subtable> - <row> - <label>http://referrer.com/Other_Page.htm</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - </subtable> - </row> - </result> - <result date="2010-01-06"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <subtable> - <row> - <label>http://referrer.com/Other_Page.htm</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - </subtable> - </row> - </result> - <result date="2010-01-07"> - <row> - <label>referrer.com</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - <subtable> - <row> - <label>http://referrer.com/Other_Page.htm</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>5</nb_actions> - <nb_users>0</nb_users> - <max_actions>5</max_actions> - <sum_visit_length>901</sum_visit_length> - <bounce_count>0</bounce_count> - <nb_visits_converted>0</nb_visits_converted> - </row> - </subtable> - </row> - </result> + <result date="2010-01-05" /> + <result date="2010-01-06" /> + <result date="2010-01-07" /> <result date="2010-01-08"> <row> <label>referrer.com</label> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml index 2be1501d3c..d84b27e20b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml @@ -3,24 +3,24 @@ <result date="2010-01"> <row> <label>referrer.com</label> - <nb_visits>9</nb_visits> - <nb_actions>42</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>22</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7569</sum_visit_length> + <sum_visit_length>3965</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>8</nb_visits> - <nb_actions>40</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>20</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7208</sum_visit_length> + <sum_visit_length>3604</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml index c0579730ef..808baafb9a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml @@ -4,24 +4,24 @@ <result date="From 2010-01-04 to 2010-01-10"> <row> <label>referrer.com</label> - <nb_visits>7</nb_visits> - <nb_actions>32</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>17</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>5767</sum_visit_length> + <sum_visit_length>3064</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>6</nb_visits> - <nb_actions>30</nb_actions> + <nb_visits>3</nb_visits> + <nb_actions>15</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>5406</sum_visit_length> + <sum_visit_length>2703</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -41,24 +41,24 @@ <result date="From 2010-01-11 to 2010-01-17"> <row> <label>referrer.com</label> - <nb_visits>2</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>5</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1802</sum_visit_length> + <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>2</nb_visits> - <nb_actions>10</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>5</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1802</sum_visit_length> + <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> </subtable> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml index 76f90bbf1d..09f596aa7b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml @@ -3,24 +3,24 @@ <result date="2010"> <row> <label>referrer.com</label> - <nb_visits>9</nb_visits> - <nb_actions>42</nb_actions> + <nb_visits>5</nb_visits> + <nb_actions>22</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7569</sum_visit_length> + <sum_visit_length>3965</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>8</nb_visits> - <nb_actions>40</nb_actions> + <nb_visits>4</nb_visits> + <nb_actions>20</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>7208</sum_visit_length> + <sum_visit_length>3604</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> 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 cb454743aa..f7a14444dc 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 @@ -205,25 +205,28 @@ No data available Referrer Type label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -Websites,9,42,4.67,00:14:01,0%,$ 0 +Websites,5,22,4.4,00:13:13,0%,$ 0 +Campaigns,4,20,5,00:15:01,0%,$ 0 Direct Entry,1,1,1,00:00:00,100%,$ 0 All Referrers label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -referrer.com,9,42,0%,4.67,00:14:01,0% +goal-matching-url-parameter,4,20,0%,5,00:15:01,0% +referrer.com,5,22,0%,4.4,00:13:13,0% Keywords No data available Websites label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -referrer.com,9,42,4.67,00:14:01,0%,$ 0 +referrer.com,5,22,4.4,00:13:13,0%,$ 0 Search Engines No data available Campaigns -No data available +label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue +goal-matching-url-parameter,4,20,5,00:15:01,0%,$ 0 Social Networks No data available diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 88ed239c6d..7ab0bbf505 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -3858,7 +3858,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -3895,16 +3895,16 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Websites </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 42 + 22 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.67 + 4.4 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:14:01 + 00:13:13 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -3916,6 +3916,29 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + Campaigns </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 4 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 20 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 5 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:15:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + $ 0 + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Direct Entry </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 @@ -3947,7 +3970,7 @@ </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAF/ElEQVR4nO3dPW4jZQDH4QlKQEqTAwRpi5FoKE1NAS1CSklBxSGQ6KHdE2xHQbUN12BOgNzAOgcAKRJkxVB45Tgz/vjPOvZ85HmKKHZeO68TOfPz65nJWV3XBQDAPh/0PQEAYBxEAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDREyrLceOXG63ffCgBGSjQcZD6f51/VEACM2nnfExiEn1791rjmh+8+W784n8/LslyPgMZFAJg80VAURfH7n3/d39+vLl5cXCwWi+vr6703bJfE6vNGZyy/tBqw/Or64MMeAQAcnWh45+7ubvX51dXV7e1tEg3rdgREsakhrFsAMC72aUitrw0k2/hOEaAYABg+0fBkllUR7u3YaTAADIG3J965vLw8/E6WCwbLFAiXIsLBANA70VAURXHzRXm7WOwdtnqHIjnSMl9yKOzTAMAYiIaiKIqvP39RFC8OvJNOG36VAMDoiIYn0z6KcuMBFNsGn2aSAPDezuq67nsOAMAIOHoCAIiIBgAgIhoAgIhoAAAiogEAiIgGACDiPA3ASbVPluo8JTAW048G51CCofFMhOFo/HuE3RvNiUdD42zNTt4MACvLzeIqFPZuNCceDcAAWf+Dgej6BBQNwEk1/khZ/4MRcfQEABARDQBARDQAJ9U+5BIYC/s0ACe1vqt2YUdIGJWzuq77nsNx+fMEABs1Vv72Nv30owEAeBL2aQAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiDyXaKiqqu8pAI94VsLQ7H1WPpdoAAAOJBoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi531P4HT++fdt31MAHty//c+zkqn66MNpbl6n+ag2+ub7X/ueAvDYL2/6ngEcxeuXN31P4Si8PQEAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBApFs0lGVZluWRpgIADNl5PrQsy/l8frypAMD0rL/YHvtmtEM0AACdNF5vj/3l90M0LB/J6vE0ymh5cflx24CNH1d3vm1wY0LtIts4k/bFUf8aAGD4Hq00rBdDu4waEdAY0Liy0+D2BLZds14tu78LAPC0Hu0IeeBGd/3me+/KBh4AxmXrPg17j5LodBiFYy4AeIYa76qP3dZo6LpUsPuH0mkwAExG+0328YrO03CCVYex/xwBYLcJ7Hu3eaWhfZDC3gE7tvr54PbITt8IAIZmSkf5ndV13fccTqGqqh9//qPvWQDwLLx+edP3FN5HVVWz2WzHAP97AgCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAIDIed8TOJ1vv/q07ykAD94sFh9fX/c9C6CDZxQNN19+0vcUgAdV9fds5lkJY+LtCQAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiZ3Vd9z0HAGAErDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQOR/DaacjuySjYIAAAAASUVORK5CYII=" + src="data:image/png;base64,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" height="200" width="700"/> @@ -3982,18 +4005,41 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + goal-matching-url-parameter </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 4 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 20 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 5 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:15:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style="background-color: rgb(249,250,250)"> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> referrer.com </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 42 + 22 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.67 + 4.4 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:14:01 + 00:13:13 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -4018,7 +4064,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -4055,16 +4101,16 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> referrer.com </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 42 + 22 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.67 + 4.4 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:14:01 + 00:13:13 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -4088,7 +4134,68 @@ Campaigns </h2> - There is no data for this report. + <img alt="" + src="data:image/png;base64,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" + height="200" + width="700"/> + + <br/> + <br/> + + <table style="border-collapse:collapse; margin-left: 5px;"> + <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> + <th style="padding: 6px 0;"> + Campaign + </th> + <th style="padding: 6px 0;"> + Visits + </th> + <th style="padding: 6px 0;"> + Actions + </th> + <th style="padding: 6px 0;"> + Actions per Visit + </th> + <th style="padding: 6px 0;"> + Avg. Time on Website + </th> + <th style="padding: 6px 0;"> + Bounce Rate + </th> + <th style="padding: 6px 0;"> + Revenue + </th> + </thead> + <tbody> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + goal-matching-url-parameter </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 4 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 20 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 5 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:15:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + $ 0 + </td> + </tr> + </tbody> + </table> + <br/> + <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> + Back to top + </a> <h2 id="Referrers_getSocials" style="color: rgb(126,115,99); font-size: 11pt;"> Social Networks </h2> 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 3dc09d6491..7bc90193a7 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 @@ -3745,16 +3745,16 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Websites </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 42 + 22 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.67 + 4.4 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:14:01 + 00:13:13 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -3766,6 +3766,29 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + Campaigns </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 4 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 20 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 5 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:15:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + $ 0 + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> Direct Entry </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 @@ -3826,18 +3849,41 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + goal-matching-url-parameter </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 4 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 20 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 5 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:15:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style="background-color: rgb(249,250,250)"> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> referrer.com </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 42 + 22 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.67 + 4.4 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:14:01 + 00:13:13 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -3893,16 +3939,16 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> referrer.com </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 42 + 22 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.67 + 4.4 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:14:01 + 00:13:13 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -3926,7 +3972,62 @@ Campaigns </h2> - There is no data for this report. + + + <table style="border-collapse:collapse; margin-left: 5px;"> + <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> + <th style="padding: 6px 0;"> + Campaign + </th> + <th style="padding: 6px 0;"> + Visits + </th> + <th style="padding: 6px 0;"> + Actions + </th> + <th style="padding: 6px 0;"> + Actions per Visit + </th> + <th style="padding: 6px 0;"> + Avg. Time on Website + </th> + <th style="padding: 6px 0;"> + Bounce Rate + </th> + <th style="padding: 6px 0;"> + Revenue + </th> + </thead> + <tbody> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + goal-matching-url-parameter </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 4 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 20 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 5 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:15:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + $ 0 + </td> + </tr> + </tbody> + </table> + <br/> + <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> + Back to top + </a> <h2 id="Referrers_getSocials" style="color: rgb(126,115,99); font-size: 11pt;"> Social Networks </h2> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex 1fbdd629d8..047dd073fd 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject f717317979dcb6b35f08de43e358b8fd545b197 +Subproject 6c9d18f9a03a43c9418922de11da1f063ac96a2 |