diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2017-09-27 10:36:57 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-09-27 10:36:57 +0300 |
commit | 9611b36d22bcdaa3b46993a2e759012ce2a6a0ae (patch) | |
tree | 4f6394347a13b1d9aaea34c44f0f5e03a2d64a92 /plugins | |
parent | d9f1535688938f17321caf1d4db73649b02d2229 (diff) |
Tracking: Write current interaction position for all actions (#12125)
* write current interaction position for all actions
* fix some tests
* fix more tests
* update tests
Diffstat (limited to 'plugins')
7 files changed, 209 insertions, 141 deletions
diff --git a/plugins/Actions/Columns/InteractionPosition.php b/plugins/Actions/Columns/InteractionPosition.php index 34bd9064f2..13c85ede65 100644 --- a/plugins/Actions/Columns/InteractionPosition.php +++ b/plugins/Actions/Columns/InteractionPosition.php @@ -8,6 +8,7 @@ */ namespace Piwik\Plugins\Actions\Columns; +use Piwik\Plugins\Events\Actions\ActionEvent; use Piwik\Tracker\Action; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; @@ -33,7 +34,13 @@ class InteractionPosition extends ActionDimension if ($shouldCount && $visitor->isNewVisit()) { return 1; } else if ($shouldCount) { - return VisitTotalInteractions::getCurrentInteractionPosition($request); + return VisitTotalInteractions::getNextInteractionPosition($request); + } + + // we re-use same interaction position as last page view eg for events etc. + $position = VisitTotalInteractions::getCurrentInteractionPosition($request); + if ($position >= 1) { + return $position; } return false; diff --git a/plugins/Actions/Columns/VisitTotalInteractions.php b/plugins/Actions/Columns/VisitTotalInteractions.php index 14a5572ad4..9c10b1e03a 100644 --- a/plugins/Actions/Columns/VisitTotalInteractions.php +++ b/plugins/Actions/Columns/VisitTotalInteractions.php @@ -74,6 +74,17 @@ class VisitTotalInteractions extends VisitDimension { $position = $request->getMetadata('Actions', 'visit_total_interactions'); + return (int) $position; + } + + /** + * @param Request $request + * @return int + */ + public static function getNextInteractionPosition($request) + { + $position = self::getCurrentInteractionPosition($request); + $position = $position + 1; // Remove this in Piwik 4 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 52061fb273..ffc826a4ca 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -38,7 +38,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -56,7 +56,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -74,7 +74,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -92,7 +92,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -110,7 +110,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -128,7 +128,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -146,7 +146,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -164,7 +164,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -182,7 +182,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -200,7 +200,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -218,7 +218,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -230,13 +230,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -272,10 +277,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> @@ -350,7 +355,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -368,7 +373,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -386,7 +391,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -404,7 +409,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -422,7 +427,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -440,7 +445,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -458,7 +463,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -476,7 +481,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -494,7 +499,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -512,7 +517,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -530,7 +535,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -542,13 +547,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -584,10 +594,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> 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 52061fb273..ffc826a4ca 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -38,7 +38,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -56,7 +56,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -74,7 +74,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -92,7 +92,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -110,7 +110,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -128,7 +128,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -146,7 +146,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -164,7 +164,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -182,7 +182,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -200,7 +200,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -218,7 +218,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -230,13 +230,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -272,10 +277,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> @@ -350,7 +355,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -368,7 +373,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -386,7 +391,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -404,7 +409,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -422,7 +427,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -440,7 +445,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -458,7 +463,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -476,7 +481,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -494,7 +499,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -512,7 +517,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -530,7 +535,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -542,13 +547,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -584,10 +594,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> 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 52061fb273..ffc826a4ca 100644 --- 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 @@ -38,7 +38,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -56,7 +56,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -74,7 +74,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -92,7 +92,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -110,7 +110,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -128,7 +128,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -146,7 +146,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -164,7 +164,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -182,7 +182,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -200,7 +200,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -218,7 +218,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -230,13 +230,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -272,10 +277,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> @@ -350,7 +355,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -368,7 +373,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -386,7 +391,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -404,7 +409,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -422,7 +427,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -440,7 +445,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -458,7 +463,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -476,7 +481,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -494,7 +499,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -512,7 +517,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -530,7 +535,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -542,13 +547,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -584,10 +594,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> 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 52061fb273..ffc826a4ca 100644 --- 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 @@ -38,7 +38,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -56,7 +56,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -74,7 +74,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -92,7 +92,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -110,7 +110,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -128,7 +128,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -146,7 +146,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -164,7 +164,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -182,7 +182,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -200,7 +200,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -218,7 +218,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -230,13 +230,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -272,10 +277,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> @@ -350,7 +355,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -368,7 +373,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -386,7 +391,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -404,7 +409,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -422,7 +427,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -440,7 +445,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -458,7 +463,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -476,7 +481,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -494,7 +499,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -512,7 +517,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -530,7 +535,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -542,13 +547,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -584,10 +594,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> 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 52061fb273..ffc826a4ca 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -38,7 +38,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -56,7 +56,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -74,7 +74,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -92,7 +92,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -110,7 +110,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -128,7 +128,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -146,7 +146,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -164,7 +164,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -182,7 +182,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -200,7 +200,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -218,7 +218,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -230,13 +230,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -272,10 +277,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> @@ -350,7 +355,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -368,7 +373,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -386,7 +391,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -404,7 +409,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -422,7 +427,7 @@ <contentTarget>http://www.example.com</contentTarget> <contentInteraction>submit</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -440,7 +445,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -458,7 +463,7 @@ <contentTarget>http://piwik.org/</contentTarget> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -476,7 +481,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -494,7 +499,7 @@ <contentTarget>http://piwik.org/download</contentTarget> <contentInteraction>click</contentInteraction> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -512,7 +517,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -530,7 +535,7 @@ <contentTarget /> <contentInteraction /> <bandwidth /> - <interactionPosition /> + <interactionPosition>1</interactionPosition> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -542,13 +547,18 @@ + + + + + + <userId /> <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitCount>1</visitCount> - <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> @@ -584,10 +594,10 @@ <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <totalEcommerceRevenue>0.00</totalEcommerceRevenue> + <totalEcommerceRevenue>0</totalEcommerceRevenue> <totalEcommerceConversions>0</totalEcommerceConversions> <totalEcommerceItems>0</totalEcommerceItems> - <totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> <totalAbandonedCarts>0</totalAbandonedCarts> <totalAbandonedCartsItems>0</totalAbandonedCartsItems> <events>0</events> |