Refs #3089, show abandoned cart info in visitor profile if present.

3 files changed, 17 insertions, 6 deletions

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index e6296c133c..e81997641e 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -165,12 +165,17 @@ class API
     }
 
     /**
-     * TODO
-     * TODO: add abandoned cart info.
+     * Returns an array describing a visitor using her last visits (uses a maximum of 100).
+     * 
      * TODO: check for most recent vs. first visit
      * TODO: check for goals plugin, etc.
+     * 
+     * @param int $idSite Site ID
+     * @param string $idVisitor The ID of the visitor whose profile to retrieve.
+     * @param string|false $segment
+     * @return array
      */
-    public function getVisitorProfile($idSite, $idVisitor = false, $segment = false)
+    public function getVisitorProfile($idSite, $idVisitor, $segment = false)
     {
         if ($idVisitor === false) {
             $idVisitor = $this->getMostRecentVisitorId($idSite, $segment);
@@ -179,7 +184,7 @@ class API
         if ($segment !== false) {
             $segment .= ';';
         }
-        $segment .= 'visitorId==' . $idVisitor; // TODO what happens when visitorId is in the segment?
+        $segment .= 'visitorId==' . $idVisitor;
 
         $visits = $this->getLastVisitsDetails($idSite, $period = false, $date = false, $segment,
                                               $filter_limit = self::VISITOR_PROFILE_MAX_VISITS_TO_AGGREGATE,
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
index 373ab97b4e..6200eace0a 100644
--- a/plugins/Live/stylesheets/visitor_profile.less
+++ b/plugins/Live/stylesheets/visitor_profile.less
@@ -259,6 +259,7 @@
 
 .visitor-profile-summary > div {
     margin-top:6px;
+    margin-right:1em;
 }
 
 .visitor-profile-summary strong {
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index d920b97e6d..f596d77485 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -38,8 +38,13 @@
                             {%- if not loop.first %}, {% endif -%}{{- totalConversions }} <span class="visitor-profile-goal-name">{{ goals[idGoal]['name'] -}}</span>
                             {%- endfor -%}
                         ){% endif %}.</p>
-                        {% if visitorData.totalEcommerceConversions is defined %}
-                        <p>{{ 'Live_EcommerceSummary'|translate('<strong>', visitorData.totalEcommerceConversions, visitorData.totalEcommerceRevenue|money(idSite), '</strong>', visitorData.totalEcommerceItems)|raw }}</p>
+                        {% if visitorData.totalEcommerceConversions is defined or visitorData.totalAbandonedCarts is defined %}
+                        <p>
+                            {{ 'Goals_Ecommerce'|translate }}:
+                            {%- if visitorData.totalEcommerceConversions is defined %} {{ 'Live_EcommerceSummaryConversions'|translate('<strong>', visitorData.totalEcommerceConversions, visitorData.totalEcommerceRevenue|money(idSite), '</strong>', visitorData.totalEcommerceItems)|raw }}
+                            {%- endif -%}
+                            {%- if visitorData.totalAbandonedCarts|default(0) >= 0 %} {{ 'Live_AbandonedCartSummary'|translate('<strong>', visitorData.totalAbandonedCarts, '</strong>', visitorData.totalAbandonedCartsItems, '<strong>', visitorData.totalAbandonedCartsRevenue|money(idSite), '</strong>')|raw }}{%- endif -%}
+                        </p>
                         {% endif %}
                     </div>
                 </div>