Refs matomo-org#3089, show abandoned cart info in visitor profile if …

…present.
sabl0r · Sep 11, 2013 · c3190b1 · c3190b1
1 parent ef9a068
commit c3190b1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -1136,7 +1136,8 @@
         "LastVisit": "Last visit",
         "VisitSummary": "Spent a total of %1$s%2$s on the website%3$s, and %4$sviewed %5$s pages in %6$s visits.%7$s",
         "ConvertedNGoals": "Converted %s Goals",
-        "EcommerceSummary": "Ecommerce: %1$s%2$s orders for a total of %3$s%4$s, purchased %5$s items.",
+        "EcommerceSummaryConversions": "%1$s%2$s orders for a total of %3$s%4$s, purchased %5$s items.",
+        "AbandonedCartSummary": "%1$s%2$s abandoned carts%3$s and %4$s abandoned items %5$sworth a total of %6$s%7$s.",
         "VisitedPages": "Visited pages",
         "LoadMoreVisits": "Load more visits",
         "NoMoreVisits_js": "There are no more visits for this visitor.",

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
@@ -165,12 +165,17 @@ public function getLastVisitsDetails($idSite, $period, $date, $segment = false,
     }
 
     /**
-     * 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 @@ public function getVisitorProfile($idSite, $idVisitor = false, $segment = false)
         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
@@ -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
@@ -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>