Use both Days since First visit and Days since last visit to determine whether a user is returning

1 files changed, 5 insertions, 3 deletions

diff --git a/plugins/CoreHome/Columns/VisitorReturning.php b/plugins/CoreHome/Columns/VisitorReturning.php
index 5f3ba2584a..3a7268052e 100644
--- a/plugins/CoreHome/Columns/VisitorReturning.php
+++ b/plugins/CoreHome/Columns/VisitorReturning.php
@@ -49,8 +49,6 @@ class VisitorReturning extends VisitDimension
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
     {
-        $visitCount = $request->getVisitCount();
-        $daysSinceFirstVisit = $request->getDaysSinceFirstVisit();
 
         $daysSinceLastOrder = $request->getDaysSinceLastOrder();
         $isReturningCustomer = ($daysSinceLastOrder !== false);
@@ -59,7 +57,11 @@ class VisitorReturning extends VisitDimension
             return self::IS_RETURNING_CUSTOMER;
         }
 
-        if ($visitCount > 1 || $visitor->isVisitorKnown() || $daysSinceFirstVisit > 0) {
+        $visitCount = $request->getVisitCount();
+        $daysSinceFirstVisit = $request->getDaysSinceFirstVisit();
+        $daysSinceLastVisit = $request->getDaysSinceLastVisit();
+
+        if ($visitCount > 1 || $visitor->isVisitorKnown() || $daysSinceFirstVisit > 0 || $daysSinceLastVisit > 0) {
             return self::IS_RETURNING;
         }