Fixes #3368

 * Display abandoned carts in ecommerce log, when no order
  * when no order but some abandoned carts, display ecommerce reports with abandoned carts info

git-svn-id: http://dev.piwik.org/svn/trunk@6939 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/Live/templates/visitorLog.tpl b/plugins/Live/templates/visitorLog.tpl
index d10bc45a37..641e5b2aaa 100644
--- a/plugins/Live/templates/visitorLog.tpl
+++ b/plugins/Live/templates/visitorLog.tpl
@@ -164,7 +164,7 @@
 					{/foreach}
 				{/if}
 				{/capture}
-				{if !$javascriptVariablesToSet.filterEcommerce 	
+				{if !$javascriptVariablesToSet.filterEcommerce
 					|| $action.type == 'ecommerceOrder' 	
 					|| $action.type == 'ecommerceAbandonedCart'}
 				<li class="{if !empty($action.goalName)}goal{else}action{/if}" title="{$action.serverTimePretty|escape:'html'}{if !empty($action.url) && strlen(trim($action.url))} - {$action.url|escape:'html'}{/if} {if strlen(trim($customVariablesTooltip))} - {$customVariablesTooltip}{/if}{if isset($action.timeSpentPretty)} - {'General_TimeOnPage'|translate}: {$action.timeSpentPretty}{/if}">
@@ -176,6 +176,10 @@
  					{capture assign='visitorHasSomeEcommerceActivity'}1{/capture}
  					<strong>{'Goals_EcommerceOrder'|translate}</strong> <span style='color:#666666'>({$action.orderId})</span>
 					{else}<strong>{'Goals_AbandonedCart'|translate}</strong>
+					
+					{* TODO: would be nice to have the icons Orders / Cart in the ecommerce log footer *}
+					{if $javascriptVariablesToSet.filterEcommerce == 2}{capture assign='visitorHasSomeEcommerceActivity'}1{/capture}{/if}
+					
 					{/if} <br/>
 					<span {if !$isWidget}style='margin-left:20px'{/if}>
 					{if $action.type == 'ecommerceOrder'}
@@ -196,7 +200,7 @@
  					{if !empty($action.itemDetails)}
  					<ul style='list-style:square;margin-left:{if $isWidget}15{else}50{/if}px'>
  					{foreach from=$action.itemDetails item=product}
-						<li>{$product.itemSKU}{if !empty($product.itemName)}: {$product.itemName}{/if}{if !empty($product.itemCategory)} ({$product.itemCategory}){/if}, 
+						<li>{$product.itemSKU|escape}{if !empty($product.itemName)}: {$product.itemName|escape}{/if}{if !empty($product.itemCategory)} ({$product.itemCategory|escape}){/if}, 
 						{'General_Quantity'|translate}: {$product.quantity},
 						{'General_Price'|translate}: {$product.price|money:$javascriptVariablesToSet.idSite}
 						</li> 					
@@ -235,10 +239,11 @@
 	{/capture}
 	
 	{if !$javascriptVariablesToSet.filterEcommerce
-		|| (isset($visitorHasSomeEcommerceActivity) && $visitorHasSomeEcommerceActivity)}
+		|| !empty($visitorHasSomeEcommerceActivity)}
 		{$visitorRow}
 	{/if}
 {/foreach}
+
 	</tbody>
 	</table>
 	{/if}