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:
authorBenaka Moorthi <benaka.moorthi@gmail.com>2013-07-12 07:00:48 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-07-12 07:00:48 +0400
commit55f487ca9503a134f7414cd7a1e515fcc80ddc30 (patch)
tree2c372fe8e4d9e9891fcbd62619c6c692f28102fd /plugins
parent145661260ad127a5435d8789df7841f858264541 (diff)
Fix twig bugs in ecommerce log display.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Live/templates/getVisitorLog.twig18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index 26cb8473dd..49ca33f796 100644
--- a/plugins/Live/templates/getVisitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -220,7 +220,7 @@
<strong>{{ 'Goals_EcommerceOrder'|translate }}</strong>
<span style='color:#666666'>({{ action.orderId }})</span>
{% else %}
- <strong>{'Goals_AbandonedCart'|translate}</strong>
+ <strong>{{'Goals_AbandonedCart'|translate}}</strong>
{# TODO: would be nice to have the icons Orders / Cart in the ecommerce log footer #}
{% if javascriptVariablesToSet.filterEcommerce == 2 %}
@@ -231,17 +231,17 @@
<span {% if not isWidget %}style='margin-left:20px'{% endif %}>
{% if action.type == 'ecommerceOrder' %}
<abbr title="
- {{ 'Live_GoalRevenue'|translate }}: {{ action.revenue|money(javascriptVariablesToSet.idSite) }}
- {% if action.revenueSubTotal is not empty %} - {{ 'General_Subtotal'|translate }}: {{ action.revenueSubTotal|money(javascriptVariablesToSet.idSite) }}{% endif %}
- {% if action.revenueTax is not empty %} - {{ 'General_Tax'|translate }}: {{ action.revenueTax|money(javascriptVariablesToSet.idSite) }}{% endif %}
- {% if action.revenueShipping is not empty %} - {{ 'General_Shipping'|translate }}: {{ action.revenueShipping|money(javascriptVariablesToSet.idSite) }}{% endif %}
- {% if action.revenueDiscount is not empty %} - {{ 'General_Discount'|translate }}: {{ action.revenueDiscount|money(javascriptVariablesToSet.idSite) }}{% endif %}
+ {{ 'Live_GoalRevenue'|translate }}: {{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}
+ {% if action.revenueSubTotal is not empty %} - {{ 'General_Subtotal'|translate }}: {{ action.revenueSubTotal|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
+ {% if action.revenueTax is not empty %} - {{ 'General_Tax'|translate }}: {{ action.revenueTax|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
+ {% if action.revenueShipping is not empty %} - {{ 'General_Shipping'|translate }}: {{ action.revenueShipping|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
+ {% if action.revenueDiscount is not empty %} - {{ 'General_Discount'|translate }}: {{ action.revenueDiscount|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
">{{ 'Live_GoalRevenue'|translate }}:
{% else %}
{% set revenueLeft %}{{ 'Live_GoalRevenue'|translate }}{% endset %}
{{ 'Goals_LeftInCart'|translate(revenueLeft) }}:
{% endif %}
- <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite) }}</strong>
+ <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}</strong>
{% if action.type == 'ecommerceOrder' %}
</abbr>
{% endif %}, {{ 'General_Quantity'|translate }}: {{ action.items }}
@@ -255,7 +255,7 @@
{% if product.itemCategory is not empty %} ({{ product.itemCategory }}){% endif %}
,
{{ 'General_Quantity'|translate }}: {{ product.quantity }},
- {{ 'General_Price'|translate }}: {{ product.price|money(javascriptVariablesToSet.idSite) }}
+ {{ 'General_Price'|translate }}: {{ product.price|money(javascriptVariablesToSet.idSite)|raw }}
</li>
{% endfor %}
</ul>
@@ -290,7 +290,7 @@
<img src="{{ action.icon }}" />
<strong>{{ action.goalName }}</strong>
{% if action.revenue > 0 %}, {{ 'Live_GoalRevenue'|translate }}:
- <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite) }}</strong>
+ <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}</strong>
{% endif %}
{% endif %}
</li>