From 94c4db44b96e9ca9bc01a4c610183d9ce1537695 Mon Sep 17 00:00:00 2001 From: Sam <8619576+samjf@users.noreply.github.com> Date: Mon, 11 Oct 2021 16:20:44 +1300 Subject: Optimise ecommerce life time metric query (#18097) --- ...estAPITest__Live.getLastVisitsDetails_range.xml | 210 ----------- ...est_Contents__Live.getLastVisitsDetails_day.xml | 12 - ...t_Contents__Live.getLastVisitsDetails_month.xml | 12 - ...ractionMatch__Live.getLastVisitsDetails_day.xml | 12 - ...tTargetMatch__Live.getLastVisitsDetails_day.xml | 12 - ...OrPieceMatch__Live.getLastVisitsDetails_day.xml | 12 - ...t0_noOptions__Live.getLastVisitsDetails_day.xml | 18 - ...0_noOptions__Live.getLastVisitsDetails_year.xml | 42 --- ...t1_noOptions__Live.getLastVisitsDetails_day.xml | 18 - ...1_noOptions__Live.getLastVisitsDetails_year.xml | 42 --- plugins/Ecommerce/VisitorDetails.php | 52 ++- .../expected/test___Live.getVisitorProfile.xml | 60 ---- ...ctionSegment__Live.getLastVisitsDetails_day.xml | 12 - ...est_allSites__Live.getLastVisitsDetails_day.xml | 24 -- ...LimitDashOne__Live.getLastVisitsDetails_day.xml | 18 - ...lterLimitOne__Live.getLastVisitsDetails_day.xml | 6 - ...NonRecursive__Live.getLastVisitsDetails_day.xml | 18 - ..._hideColumns__Live.getLastVisitsDetails_day.xml | 18 - .../test_higherLimit__Live.getVisitorProfile.xml | 120 ------- ...st_httpshost__Live.getLastVisitsDetails_day.xml | 18 - .../test_maxVisitLimit__Live.getVisitorProfile.xml | 60 ---- ...t_multiSites__Live.getLastVisitsDetails_day.xml | 24 -- ...rivacyManager_gdpr_tools_visits_showprofile.png | 4 +- ...CustomEvents__Live.getLastVisitsDetails_day.xml | 69 +--- ...stomEvents__Live.getLastVisitsDetails_month.xml | 69 +--- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 392 +++------------------ ...ixedSiteId__Live.getLastVisitsDetails_range.xml | 105 +----- ...AndLimit_1__Live.getLastVisitsDetails_month.xml | 18 - ...AndLimit_2__Live.getLastVisitsDetails_month.xml | 18 - ...ls_sortAsc__Live.getLastVisitsDetails_month.xml | 42 --- ...tByIdVisit__Live.getLastVisitsDetails_month.xml | 42 --- ...s_sortDesc__Live.getLastVisitsDetails_month.xml | 42 --- ...ebsiteTest__Live.getLastVisitsDetails_month.xml | 60 ---- ...insSegment__Live.getLastVisitsDetails_month.xml | 60 ---- ...alsSegment__Live.getLastVisitsDetails_month.xml | 60 ---- ...ookieSupport__Live.getLastVisitsDetails_day.xml | 12 - ...ordSpecified__Live.getLastVisitsDetails_day.xml | 12 - ...fThreeDays__Live.getLastVisitsDetails_month.xml | 18 - ...aignTracking__Live.getLastVisitsDetails_day.xml | 60 ---- ...est_Utf8mb4__Live.getLastVisitsDetails_year.xml | 6 - ...st_csvExport__Live.getLastVisitsDetails_day.csv | Bin 5288 -> 5074 bytes ...ndNormalAPI__Live.getFirstVisitForVisitorId.xml | 6 - ...dNormalAPI__Live.getLastVisitsDetails_range.xml | 18 - ...etadataAndNormalAPI__Live.getVisitorProfile.xml | 12 - ...pagesegment__Live.getFirstVisitForVisitorId.xml | 6 - ...agesegment__Live.getLastVisitsDetails_range.xml | 18 - ...rmalAPI_pagesegment__Live.getVisitorProfile.xml | 12 - 47 files changed, 126 insertions(+), 1855 deletions(-) diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 2a27148849..3b09527be0 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -99,12 +99,6 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn @@ -335,12 +329,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Unknown unk @@ -493,12 +481,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -716,12 +698,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -883,12 +859,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur @@ -1156,12 +1126,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -1314,12 +1278,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur @@ -1537,12 +1495,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1695,12 +1647,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1939,12 +1885,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -2106,12 +2046,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -2358,12 +2292,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -2610,12 +2538,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Asia asi @@ -2760,12 +2682,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur @@ -2918,12 +2834,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Asia asi @@ -3162,12 +3072,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -3406,12 +3310,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 11.0 - 111.11 - 1 - 1 - 0 - 0 - 0 1 North America amn @@ -3556,12 +3454,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur @@ -3714,12 +3606,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 11.0 - 111.11 - 1 - 1 - 0 - 0 - 0 0 North America amn @@ -3937,12 +3823,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -4160,12 +4040,6 @@ plugins/Morpheus/icons/dist/browsers/AN.png AN - 111.11 - 1 - 1 - 0 - 0 - 0 1 North America amn @@ -4383,12 +4257,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 - 111.11 - 1 - 1 - 0 - 0 - 0 1 North America amn @@ -4598,12 +4466,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Asia asi @@ -4765,12 +4627,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur @@ -4932,12 +4788,6 @@ plugins/Morpheus/icons/dist/browsers/AN.png AN - 111.11 - 1 - 1 - 0 - 0 - 0 0 North America amn @@ -5099,12 +4949,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 - 111.11 - 1 - 1 - 0 - 0 - 0 0 North America amn @@ -5266,12 +5110,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Asia asi @@ -5539,12 +5377,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -5812,12 +5644,6 @@ plugins/Morpheus/icons/dist/browsers/CM.png CM 33.0 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -6085,12 +5911,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 32.0 - 111.11 - 1 - 1 - 0 - 0 - 0 1 North America amn @@ -6350,12 +6170,6 @@ plugins/Morpheus/icons/dist/browsers/QQ.png QQ 5.0 - 111.11 - 1 - 1 - 0 - 0 - 0 1 Europe eur @@ -6508,12 +6322,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur @@ -6666,12 +6474,6 @@ plugins/Morpheus/icons/dist/browsers/CM.png CM 33.0 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur @@ -6824,12 +6626,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 32.0 - 111.11 - 1 - 1 - 0 - 0 - 0 0 North America amn @@ -6982,12 +6778,6 @@ plugins/Morpheus/icons/dist/browsers/QQ.png QQ 5.0 - 111.11 - 1 - 1 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index dde5c631d1..22c5d293ad 100755 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -352,12 +352,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -737,12 +731,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index dde5c631d1..22c5d293ad 100755 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -352,12 +352,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -737,12 +731,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index dde5c631d1..22c5d293ad 100755 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -352,12 +352,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -737,12 +731,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index dde5c631d1..22c5d293ad 100755 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -352,12 +352,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -737,12 +731,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index dde5c631d1..22c5d293ad 100755 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -352,12 +352,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -737,12 +731,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml index 2201e0b83b..6f4d6d5e7b 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml @@ -105,12 +105,6 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -236,12 +230,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -367,12 +355,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index d6cc0050a0..a76d0016f5 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -330,12 +330,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -461,12 +455,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -596,12 +584,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -731,12 +713,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -862,12 +838,6 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -993,12 +963,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -1124,12 +1088,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml index 2201e0b83b..6f4d6d5e7b 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml @@ -105,12 +105,6 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -236,12 +230,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -367,12 +355,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml index d6cc0050a0..a76d0016f5 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -330,12 +330,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -461,12 +455,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -596,12 +584,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -731,12 +713,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -862,12 +838,6 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -993,12 +963,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -1124,12 +1088,6 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi diff --git a/plugins/Ecommerce/VisitorDetails.php b/plugins/Ecommerce/VisitorDetails.php index 5b2e20a667..824d7f1790 100644 --- a/plugins/Ecommerce/VisitorDetails.php +++ b/plugins/Ecommerce/VisitorDetails.php @@ -26,18 +26,25 @@ use Piwik\View; class VisitorDetails extends VisitorDetailsAbstract { const CATEGORY_COUNT = 5; + const DEFAULT_LIFETIME_STAT = array( + 'lifeTimeRevenue' => 0, + 'lifeTimeConversions' => 0, + 'lifeTimeEcommerceItems' => 0); public function extendVisitorDetails(&$visitor) { - $ecommerceMetrics = $this->queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($visitor['idSite'], - $visitor['visitorId']); - $visitor['totalEcommerceRevenue'] = $ecommerceMetrics['totalEcommerceRevenue']; - $visitor['totalEcommerceConversions'] = $ecommerceMetrics['totalEcommerceConversions']; - $visitor['totalEcommerceItems'] = $ecommerceMetrics['totalEcommerceItems']; - - $visitor['totalAbandonedCartsRevenue'] = $ecommerceMetrics['totalAbandonedCartsRevenue']; - $visitor['totalAbandonedCarts'] = $ecommerceMetrics['totalAbandonedCarts']; - $visitor['totalAbandonedCartsItems'] = $ecommerceMetrics['totalAbandonedCartsItems']; + if(Site::isEcommerceEnabledFor($visitor['idSite'])) + { + $ecommerceMetrics = $this->queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($visitor['idSite'], + $visitor['visitorId']); + $visitor['totalEcommerceRevenue'] = $ecommerceMetrics['totalEcommerceRevenue']; + $visitor['totalEcommerceConversions'] = $ecommerceMetrics['totalEcommerceConversions']; + $visitor['totalEcommerceItems'] = $ecommerceMetrics['totalEcommerceItems']; + + $visitor['totalAbandonedCartsRevenue'] = $ecommerceMetrics['totalAbandonedCartsRevenue']; + $visitor['totalAbandonedCarts'] = $ecommerceMetrics['totalAbandonedCarts']; + $visitor['totalAbandonedCartsItems'] = $ecommerceMetrics['totalAbandonedCartsItems']; + } } public function extendActionDetails(&$action, $nextAction, $visitorDetails) @@ -130,11 +137,19 @@ class VisitorDetails extends VisitorDetailsAbstract */ protected function queryEcommerceConversionsVisitorLifeTimeMetricsForVisitor($idSite, $idVisitor) { - $sql = $this->getSqlEcommerceConversionsLifeTimeMetricsForIdGoal(GoalManager::IDGOAL_ORDER); - $ecommerceOrders = $this->getDb()->fetchRow($sql, array($idSite, @Common::hex2bin($idVisitor))); + $sql = $this->getSqlEcommerceConversionsLifeTimeMetricsForIdGoal(); + $lifeTimeStats = $this->getDb()->fetchAll($sql, array($idSite, @Common::hex2bin($idVisitor))); + + $defaultStats = array_fill_keys([GoalManager::IDGOAL_CART, GoalManager::IDGOAL_ORDER], self::DEFAULT_LIFETIME_STAT); + + $lifeTimeStatsByGoal = array_reduce($lifeTimeStats, function ($carry, $statRow) { + $idgoal = $statRow['idgoal']; + $carry[$idgoal] = array_merge($carry[$idgoal], $statRow); + return $carry; + },$defaultStats); - $sql = $this->getSqlEcommerceConversionsLifeTimeMetricsForIdGoal(GoalManager::IDGOAL_CART); - $abandonedCarts = $this->getDb()->fetchRow($sql, array($idSite, @Common::hex2bin($idVisitor))); + $ecommerceOrders = $lifeTimeStatsByGoal[GoalManager::IDGOAL_ORDER]; + $abandonedCarts = $lifeTimeStatsByGoal[GoalManager::IDGOAL_CART]; return array( 'totalEcommerceRevenue' => $ecommerceOrders['lifeTimeRevenue'], @@ -148,22 +163,25 @@ class VisitorDetails extends VisitorDetailsAbstract /** - * @param $ecommerceIdGoal + * Returns and SQL string that queries for `lifeTimeRevenue`, `lifeTimeConversions`, and `lifeTimeEcommerceItems` grouped by + * `idgoal` for abandoned carts and orders. * @return string */ - protected function getSqlEcommerceConversionsLifeTimeMetricsForIdGoal($ecommerceIdGoal) + protected function getSqlEcommerceConversionsLifeTimeMetricsForIdGoal() { $sql = "SELECT + idgoal, COALESCE(SUM(" . LogAggregator::getSqlRevenue('revenue') . "), 0) as lifeTimeRevenue, COUNT(*) as lifeTimeConversions, COALESCE(SUM(" . LogAggregator::getSqlRevenue('items') . "), 0) as lifeTimeEcommerceItems FROM " . Common::prefixTable('log_visit') . " AS log_visit - LEFT JOIN " . Common::prefixTable('log_conversion') . " AS log_conversion + STRAIGHT_JOIN " . Common::prefixTable('log_conversion') . " AS log_conversion ON log_visit.idvisit = log_conversion.idvisit WHERE log_visit.idsite = ? AND log_visit.idvisitor = ? - AND log_conversion.idgoal = " . $ecommerceIdGoal . " + AND log_conversion.idgoal IN ( " . GoalManager::IDGOAL_CART . ", " . GoalManager::IDGOAL_ORDER . " ) + GROUP BY idgoal "; return $sql; } diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index b179e112cf..5875053612 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -105,12 +105,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -230,12 +224,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -355,12 +343,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -480,12 +462,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -605,12 +581,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -730,12 +700,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -855,12 +819,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -980,12 +938,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1105,12 +1057,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1230,12 +1176,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk diff --git a/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml index dd4a83207c..65172e4061 100644 --- a/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_actionSegment__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -209,12 +203,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk diff --git a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml index 75773aaa14..a0c4f834a2 100644 --- a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -209,12 +203,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -334,12 +322,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -649,12 +631,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Live/tests/System/expected/test_filterLimitDashOne__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_filterLimitDashOne__Live.getLastVisitsDetails_day.xml index 62268e3cec..6295b16111 100644 --- a/plugins/Live/tests/System/expected/test_filterLimitDashOne__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_filterLimitDashOne__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -209,12 +203,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -524,12 +512,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Live/tests/System/expected/test_filterLimitOne__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_filterLimitOne__Live.getLastVisitsDetails_day.xml index 834f0da3b3..06e5cb513e 100644 --- a/plugins/Live/tests/System/expected/test_filterLimitOne__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_filterLimitOne__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk diff --git a/plugins/Live/tests/System/expected/test_hideColumnsNonRecursive__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_hideColumnsNonRecursive__Live.getLastVisitsDetails_day.xml index 3c0617a8d9..0083bbb2fc 100644 --- a/plugins/Live/tests/System/expected/test_hideColumnsNonRecursive__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_hideColumnsNonRecursive__Live.getLastVisitsDetails_day.xml @@ -83,12 +83,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -207,12 +201,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -521,12 +509,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Live/tests/System/expected/test_hideColumns__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_hideColumns__Live.getLastVisitsDetails_day.xml index d7e74e63a2..40692b4117 100644 --- a/plugins/Live/tests/System/expected/test_hideColumns__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_hideColumns__Live.getLastVisitsDetails_day.xml @@ -82,12 +82,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -202,12 +196,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -502,12 +490,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml index ec12c9ae00..0f145aa304 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -105,12 +105,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -230,12 +224,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -355,12 +343,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -480,12 +462,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -605,12 +581,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -730,12 +700,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -855,12 +819,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -980,12 +938,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1105,12 +1057,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1230,12 +1176,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1355,12 +1295,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1480,12 +1414,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1605,12 +1533,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1730,12 +1652,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1855,12 +1771,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1980,12 +1890,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -2105,12 +2009,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -2230,12 +2128,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -2355,12 +2247,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -2480,12 +2366,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk diff --git a/plugins/Live/tests/System/expected/test_httpshost__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_httpshost__Live.getLastVisitsDetails_day.xml index c7aed20718..0dbd232f55 100644 --- a/plugins/Live/tests/System/expected/test_httpshost__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_httpshost__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -209,12 +203,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -524,12 +512,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml index 1eb2a9a8d0..873c2291f7 100644 --- a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml @@ -105,12 +105,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -230,12 +224,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -355,12 +343,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -480,12 +462,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -605,12 +581,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -730,12 +700,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -855,12 +819,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -980,12 +938,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1105,12 +1057,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -1230,12 +1176,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk diff --git a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml index 75773aaa14..a0c4f834a2 100644 --- a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -209,12 +203,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -334,12 +322,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -649,12 +631,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png index ae57f288d1..dfebaae97b 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_gdpr_tools_visits_showprofile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:852db782d93e31534a1050af4d5c9f19b8669d4b5c4e815673f96e2ea5319f28 -size 331824 +oid sha256:5c8691e12f13d8b87531e6ef09cdf0d82a47e2ac29de5e68cd76cf22bcbe67df +size 324648 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 4f29dfaf63..0dd247704c 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -85,12 +85,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -207,12 +201,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -337,12 +326,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -459,12 +443,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -697,12 +676,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 6 Europe eur @@ -927,12 +901,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 6 Europe eur @@ -1057,12 +1026,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -1179,12 +1143,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -1627,12 +1586,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 13 Europe eur @@ -2210,12 +2164,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 16 Europe eur diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 6bfdc44e38..6b6d5b21d1 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -85,12 +85,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -207,12 +201,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -437,12 +426,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 6 Europe eur @@ -559,12 +543,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -999,12 +978,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 13 Europe eur @@ -1121,12 +1095,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -1243,12 +1212,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -1373,12 +1337,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -1495,12 +1454,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 1 Europe eur @@ -1733,12 +1687,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 + 6 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 2d8954a303..ed310971e0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -107,12 +107,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -286,12 +281,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -423,12 +413,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -614,12 +599,7 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -757,12 +737,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -915,12 +890,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -1081,12 +1051,7 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -1237,12 +1202,7 @@ plugins/Morpheus/icons/dist/browsers/FM.png FM 27.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1385,12 +1345,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1601,12 +1556,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1753,12 +1703,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1913,12 +1858,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -2296,12 +2236,7 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -2429,12 +2364,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 5.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -2562,12 +2492,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -2720,12 +2645,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -2919,12 +2839,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 37.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -3114,12 +3029,7 @@ plugins/Morpheus/icons/dist/browsers/CM.png CM 39.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -3251,12 +3161,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 37.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -3392,12 +3297,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 41.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -3534,12 +3434,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 6.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -3684,12 +3579,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 11.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -3842,12 +3732,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 39.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -3975,12 +3860,7 @@ plugins/Morpheus/icons/dist/browsers/UNK.png Fútbol 1.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -4095,12 +3975,7 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 + 1 Unknown unk @@ -4214,12 +4089,7 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 + 1 Unknown unk @@ -4347,12 +4217,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -4484,12 +4349,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -4646,12 +4506,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -4818,12 +4673,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -4955,12 +4805,7 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -5092,12 +4937,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -5214,12 +5054,7 @@ plugins/Morpheus/icons/dist/browsers/UNK.png Java - 0 - 0 - 0 - 0 - 0 - 0 + 0 Oceania oce @@ -5351,12 +5186,7 @@ plugins/Morpheus/icons/dist/browsers/AN.png AN - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -5488,12 +5318,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -5625,12 +5450,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 20.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -5758,12 +5578,7 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -5891,12 +5706,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 20.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 South America ams @@ -6024,12 +5834,7 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 + 0 South America ams @@ -6157,12 +5962,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 South America ams @@ -6290,12 +6090,7 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -6423,12 +6218,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -6556,12 +6346,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -6689,12 +6474,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -6822,12 +6602,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -6955,12 +6730,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 19.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -7088,12 +6858,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 6.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -7221,12 +6986,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 19.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -7354,12 +7114,7 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -7487,12 +7242,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -7620,12 +7370,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 6.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -7753,12 +7498,7 @@ plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -7886,12 +7626,7 @@ plugins/Morpheus/icons/dist/browsers/AN.png AN - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -8019,12 +7754,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -8152,12 +7882,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -8285,12 +8010,7 @@ plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index cc59d5cde4..41ea72c5a0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -92,12 +92,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -256,12 +251,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -378,12 +368,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -554,12 +539,7 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -697,12 +677,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -840,12 +815,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 North America amn @@ -991,12 +961,7 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Asia asi @@ -1132,12 +1097,7 @@ plugins/Morpheus/icons/dist/browsers/FM.png FM 27.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1265,12 +1225,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1466,12 +1421,7 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1603,12 +1553,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1748,12 +1693,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Europe eur @@ -1896,12 +1836,7 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 6.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -2031,12 +1966,7 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 11.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk @@ -2232,12 +2162,7 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF 5.0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 Unknown unk diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 9b8f622849..65e4809050 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -195,12 +195,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Unknown unk @@ -353,12 +347,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -576,12 +564,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 551e35b58b..596958418d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -109,12 +109,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -353,12 +347,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -511,12 +499,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 19efab9b04..c373141e0f 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -109,12 +109,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -267,12 +261,6 @@ plugins/Morpheus/icons/dist/browsers/CM.png CM 33.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -425,12 +413,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 32.0 - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn @@ -583,12 +565,6 @@ plugins/Morpheus/icons/dist/browsers/QQ.png QQ 5.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -827,12 +803,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1071,12 +1041,6 @@ plugins/Morpheus/icons/dist/browsers/CM.png CM 33.0 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1315,12 +1279,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 32.0 - 0 - 0 - 0 - 0 - 0 - 0 1 North America amn diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index fd960a62e0..da9d69289f 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -99,12 +99,6 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn @@ -335,12 +329,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Unknown unk @@ -493,12 +481,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -716,12 +698,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -874,12 +850,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1118,12 +1088,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1276,12 +1240,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index fd960a62e0..da9d69289f 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -99,12 +99,6 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn @@ -335,12 +329,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Unknown unk @@ -493,12 +481,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -716,12 +698,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -874,12 +850,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1118,12 +1088,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1276,12 +1240,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 1eb0c7ecb7..44460078ae 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -99,12 +99,6 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn @@ -335,12 +329,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Unknown unk @@ -493,12 +481,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -716,12 +698,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -874,12 +850,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1118,12 +1088,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1276,12 +1240,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1499,12 +1457,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1657,12 +1609,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1901,12 +1847,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml index 887c043ac5..7114b5ff48 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml @@ -99,12 +99,6 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn @@ -249,12 +243,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -407,12 +395,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -565,12 +547,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -723,12 +699,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -881,12 +851,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1039,12 +1003,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1197,12 +1155,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Asia asi @@ -1355,12 +1307,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1513,12 +1459,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 11.0 - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml index b376ceea5b..2ab5eb163c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml @@ -99,12 +99,6 @@ plugins/Morpheus/icons/dist/browsers/SF.png SF - 0 - 0 - 0 - 0 - 0 - 0 0 North America amn @@ -249,12 +243,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -472,12 +460,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -630,12 +612,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -788,12 +764,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1011,12 +981,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1169,12 +1133,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1327,12 +1285,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1550,12 +1502,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 1 Europe eur @@ -1773,12 +1719,6 @@ plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 - 0 - 0 - 0 - 0 - 0 - 0 1 Asia asi diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index ebb5422327..ee81d60f39 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -101,12 +101,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -382,12 +376,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index c95debc2bb..6a30bd6d2f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -226,12 +220,6 @@ plugins/Morpheus/icons/dist/browsers/UNK.png UNK - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 0856f79866..f60b18a706 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -89,12 +89,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 7.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -206,12 +200,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 7.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk @@ -323,12 +311,6 @@ plugins/Morpheus/icons/dist/browsers/IE.png IE 7.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Unknown unk diff --git a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml index 94e23329a9..2b7cc45d8b 100644 --- a/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_PiwikTracker_trackForceUsingVisitId_insteadOfHeuristics_alsoTestsCampaignTracking__Live.getLastVisitsDetails_day.xml @@ -84,12 +84,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -228,12 +222,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -353,12 +341,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -478,12 +460,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -622,12 +598,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -747,12 +717,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -872,12 +836,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -997,12 +955,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1122,12 +1074,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -1247,12 +1193,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml index 2ff318219f..cdf63d68bd 100644 --- a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml @@ -108,12 +108,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 100 - 1 - 1 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index e02e824eed..f7d57ace96 100644 Binary files a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml index d3e9551f4c..a3d8b4ff16 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getFirstVisitForVisitorId.xml @@ -58,12 +58,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 6945cf1795..74819f597b 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -74,12 +74,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -211,12 +205,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -422,12 +410,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index af94c0011d..d6f2621c08 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -109,12 +109,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -257,12 +251,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml index d3e9551f4c..a3d8b4ff16 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getFirstVisitForVisitorId.xml @@ -58,12 +58,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 6945cf1795..74819f597b 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -74,12 +74,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -211,12 +205,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -422,12 +410,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index af94c0011d..d6f2621c08 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -109,12 +109,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur @@ -257,12 +251,6 @@ plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 - 0 - 0 - 0 - 0 - 0 - 0 0 Europe eur -- cgit v1.2.3