From 9287c4389f6298154dbb46d40bb4df9204d2386e Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Fri, 22 Jan 2016 03:49:41 +0000
Subject: [PATCH] fix time on last action is not calculated correctly if goals
or ecommerce is last action
---
plugins/Live/Visitor.php | 7 +++++--
...mmerceStatusOrdered__Live.getLastVisitsDetails_day.xml | 4 ++--
...merceOrderWithItems__Live.getLastVisitsDetails_day.xml | 8 ++++----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 72fba0aebe..4d15d5d3f6 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -374,16 +374,19 @@ class Visitor implements VisitorInterface
// By default, Piwik does not know how long the user stayed on the page
// If enableHeartBeatTimer() is used in piwik.js then we can find the accurate time on page for the last pageview
$visitTotalTime = $visitorDetailsArray['visitDuration'];
- $timeSpentOnAllActionsApartFromLastOne = ($visitorDetailsArray['lastActionTimestamp'] - $visitorDetailsArray['firstActionTimestamp']);
+ $timeOfLastAction = Date::factory($actionDetail['serverTimePretty'])->getTimestamp();
+
+ $timeSpentOnAllActionsApartFromLastOne = ($timeOfLastAction - $visitorDetailsArray['firstActionTimestamp']);
$timeSpentOnPage = $visitTotalTime - $timeSpentOnAllActionsApartFromLastOne;
// Safe net, we assume the time is correct when it's more than 10 seconds
if ($timeSpentOnPage > 10) {
$actionDetail['timeSpent'] = $timeSpentOnPage;
}
+
}
- if(isset($actionDetail['timeSpent'])) {
+ if (isset($actionDetail['timeSpent'])) {
$actionDetail['timeSpentPretty'] = $formatter->getPrettyTimeFromSeconds($actionDetail['timeSpent'], true);
}
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index f6d30fd9ba..5b19eea90f 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -226,8 +226,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 730c0fc1a4..d391947a56 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -87,8 +87,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
@@ -430,8 +430,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
--
GitLab