Refs #898

 * Adding "Abandoned carts" metrics to Metadata
 * Fixing few bugs in Metadata with custom parameters 
 * Adding much needed tests
 * Adding % to "rates" in metadata output

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

1 files changed, 3 insertions, 3 deletions

diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
index fd7d1c80ae..e51fc9b1d5 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
@@ -50,7 +50,7 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal extends Piwik_DataTa
 	public function __construct( $table, $enable = true, $processOnlyIdGoal )
 	{
 		$this->processOnlyIdGoal = $processOnlyIdGoal;
-		$this->isEcommerce = $this->processOnlyIdGoal == 'ecommerceOrder' || $this->processOnlyIdGoal == 'ecommerceAbandonedCart'; 
+		$this->isEcommerce = $this->processOnlyIdGoal == Piwik_Archive::LABEL_ECOMMERCE_ORDER || $this->processOnlyIdGoal == Piwik_Archive::LABEL_ECOMMERCE_CART; 
 		// Ensure that all rows with no visit but conversions will be displayed
 		$this->deleteRowsWithNoVisit = false;
 		parent::__construct($table);
@@ -77,12 +77,12 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal extends Piwik_DataTa
 				$revenue = 0;
 				foreach($goals as $goalId => $columnValue)
 				{
-					if($goalId == 'ecommerceAbandonedCart')
+					if($goalId == Piwik_Archive::LABEL_ECOMMERCE_CART)
 					{
 						continue;
 					}
 					if($goalId >= Piwik_Tracker_GoalManager::IDGOAL_ORDER
-						|| $goalId == 'ecommerceOrder'
+						|| $goalId == Piwik_Archive::LABEL_ECOMMERCE_ORDER
 					)
 					{
 						$revenue += (int)$this->getColumn($columnValue, Piwik_Archive::INDEX_GOAL_REVENUE, Piwik_Archive::$mappingFromIdToNameGoal);