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

plugins/Goals/Controller.php

@@ -156,7 +156,7 @@ class Piwik_Goals_Controller extends Piwik_Controller
 	public function getEcommerceLog($fetch = false)
 	{
 		$saveGET = $_GET;
-		$_GET['filterEcommerce'] = 1;
+		$_GET['filterEcommerce'] = Piwik_Common::getRequestVar('filterEcommerce', 1, 'int');
 		$_GET['widget'] = 1;
 		$_GET['segment'] = 'visitEcommerceStatus!=none';
 		$output = Piwik_FrontController::getInstance()->dispatch('Live', 'getVisitorLog', array($fetch));

plugins/Goals/templates/single_goal.tpl

@@ -30,7 +30,7 @@ $(document).ready( function() {
 {/literal}
 
 {if $displayFullReport}
-	{if $nb_conversions > 0}
+	{if $nb_conversions > 0 || $cart_nb_conversions > 0}
 		{include file="Goals/templates/table_by_dimension.tpl"}
 	{/if}
 {/if}

plugins/Goals/templates/table_by_dimension.tpl

@@ -23,18 +23,20 @@
 		</ul>
 	</div>
 	{/if}
-	{foreach from=$goalDimensions key=dimensionFamilyName item=dimensions}
-		<div class='dimensionCategory'>
-			{'Goals_ViewGoalsBy'|translate:$dimensionFamilyName}
-			<ul class='listCircle'>
-			{foreach from=$dimensions item=dimension}
-				<li title='{'Goals_ViewGoalsBy'|translate:$dimension.name}' class='goalDimension' module='{$dimension.module}' action='{$dimension.action}'>
-					<span class='dimension'>{$dimension.name}</span>
-				</li>
-			{/foreach}
-			</ul>
-		</div>
-	{/foreach}
+	{if $nb_conversions > 0 }
+		{foreach from=$goalDimensions key=dimensionFamilyName item=dimensions}
+			<div class='dimensionCategory'>
+				{'Goals_ViewGoalsBy'|translate:$dimensionFamilyName}
+				<ul class='listCircle'>
+				{foreach from=$dimensions item=dimension}
+					<li title='{'Goals_ViewGoalsBy'|translate:$dimension.name}' class='goalDimension' module='{$dimension.module}' action='{$dimension.action}'>
+						<span class='dimension'>{$dimension.name}</span>
+					</li>
+				{/foreach}
+				</ul>
+			</div>
+		{/foreach}
+	{/if}
 </div>
 
 <div style='float: left;'>
@@ -43,8 +45,9 @@
 	<div id='tableGoalsByDimension'></div>
 </div>
 <div class="clear"></div>
-{literal}
 <script type="text/javascript">
+var preloadAbandonedCart = {if $cart_nb_conversions > 0 && $nb_conversions == 0}1{else}0{/if};
+{literal}
 $(document).ready( function() {
 	var countLoaded = 0;
 	/* 
@@ -73,6 +76,11 @@ $(document).ready( function() {
 			// 0 is Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE
 			widgetParameters['documentationForGoalsPage'] = 1;
 		}
+		
+		if(preloadAbandonedCart) {
+			widgetParameters['viewDataTable'] = 'ecommerceAbandonedCart';
+			widgetParameters['filterEcommerce'] = 2;
+		}
 		var onWidgetLoadedCallback = function (response) {
 			if(widgetUniqueId != self.expectedWidgetUniqueId) {
 				return;

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}