Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-12-01 04:54:06 +0300
committermattab <matthieu.aubry@gmail.com>2014-12-01 04:54:06 +0300
commit377522d7d4b78cf1536addffdc29545aee8e7259 (patch)
treef6dc18e7ac478a422f97568054aad65b5865d8f3 /plugins/Live
parent583c6dbac980fabd23a278ecf6e96ecefcb587c5 (diff)
Fixes #5241 Display Abandoned cart icon even when there is no Goal or Ecommerce order in the visit
Diffstat (limited to 'plugins/Live')
-rw-r--r--plugins/Live/templates/_dataTableViz_visitorLog.twig23
1 files changed, 15 insertions, 8 deletions
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index cf0460501a..6f79756a8b 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -25,7 +25,8 @@
<tbody>
{% set cycleIndex=0 %}
{% for visitor in dataTable.getRows() %}
- {% set breakBeforeVisitorRank = (visitor.getColumn('visitEcommerceStatusIcon') and visitor.getColumn('visitorTypeIcon')) ? true : false %}
+ {% set visitHasEcommerceActivity = visitor.getColumn('visitEcommerceStatusIcon') %}
+ {% set breakBeforeVisitorRank = (visitHasEcommerceActivity and visitor.getColumn('visitorTypeIcon')) ? true : false %}
{% set visitorColumnContent %}
{% if visitor.getColumn('countryFlag') %}<img src="{{ visitor.getColumn('countryFlag') }}" title="{{ visitor.getColumn('location') }}, Provider {{ visitor.getColumn('providerName') }}"/>{% endif %}
&nbsp;
@@ -43,18 +44,24 @@
title="{{ 'General_ReturningVisitor'|translate }} - {{ 'General_NVisits'|translate(visitor.getColumn('visitCount')) }}"/>{% endif %}
{% endif %}
{% if not displayVisitorsInOwnColumn or breakBeforeVisitorRank %}<br/><br />{% endif %}
+
+ {# Goals, and/or Ecommerce activity #}
{% if visitor.getColumn('visitConverted') %}
<span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.getColumn('goalConversions')) }}" class='visitorRank'
{% if not displayVisitorsInOwnColumn or breakBeforeVisitorRank %}style="margin-left:0;"{% endif %}>
- <img src="{{ visitor.getColumn('visitConvertedIcon') }}"/>
- <span class='hash'>#</span>
- {{ visitor.getColumn('goalConversions') }}
- {% if visitor.getColumn('visitEcommerceStatusIcon') %}
- &nbsp;-
- <img src="{{ visitor.getColumn('visitEcommerceStatusIcon') }}" title="{{ visitor.getColumn('visitEcommerceStatus') }}"/>
- {% endif %}
+ <img src="{{ visitor.getColumn('visitConvertedIcon') }}"/>
+ <span class='hash'>#</span>
+ {{ visitor.getColumn('goalConversions') }}
+ {% if visitHasEcommerceActivity %}
+ &nbsp;-
+ <img src="{{ visitor.getColumn('visitEcommerceStatusIcon') }}" title="{{ visitor.getColumn('visitEcommerceStatus') }}"/>
+ {% endif %}
</span>
+ {# Ecommerce activity only (no goal) #}
+ {% elseif visitHasEcommerceActivity %}
+ <img src="{{ visitor.getColumn('visitEcommerceStatusIcon') }}" title="{{ visitor.getColumn('visitEcommerceStatus') }}"/>
{% endif %}
+
{% if not displayVisitorsInOwnColumn %}<br/><br />{% endif %}
{% if displayVisitorsInOwnColumn %}
{% if visitor.getColumn('pluginsIcons')|length > 0 %}