Refs #1120; Show goal details per action; Highlight action field in the row, where conversion happened; + Minor Updates; Must refresh assets;

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

1 files changed, 41 insertions, 5 deletions

diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 34360cec9d..00a38555f7 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -78,6 +78,10 @@ class Piwik_Live_Visitor
 			'isVisitorGoalConverted' => $this->isVisitorGoalConverted(),
 			'goalIcon' => $this->getGoalIcon(),
    			'goalType' => $this->getGoalType(),
+			'goalName' => $this->getGoalName(),
+   			'goalRevenue' => $this->getGoalRevenue(),
+			'goalUrl' => $this->getGoalUrl(),
+   			'goalTimePretty' => $this->getGoalTimePretty()
 		);
 	}
 
@@ -104,7 +108,7 @@ class Piwik_Live_Visitor
 	{
 		return $this->details['idsite'];
 	}
-
+	
 	function getNumberOfActions()
 	{
 		return $this->details['visit_total_actions'];
@@ -318,17 +322,17 @@ class Piwik_Live_Visitor
 
 	function getGoalType()
 	{
-		if(isset($this->details['match_attribute'])){
-			return $this->details['match_attribute'];
+		if(isset($this->details['goal_match_attribute'])){
+			return ucfirst($this->details['goal_match_attribute']);
 		}
 		return false;
 	}
 
 	function getGoalIcon()
 	{
-		if(isset($this->details['match_attribute'])){
+		if(isset($this->details['goal_match_attribute'])){
 			$goalicon = "";
-			switch ($this->details['match_attribute']) {
+			switch ($this->details['goal_match_attribute']) {
 				case "url":
 					$goalicon = "plugins/Live/templates/images/goal.png";
 					break;
@@ -343,4 +347,36 @@ class Piwik_Live_Visitor
 		}
 		return false;
 	}
+	
+	function getGoalName()
+	{
+		if(isset($this->details['goal_name'])){
+			return $this->details['goal_name'];
+		}
+		return false;
+	}
+	
+	function getGoalRevenue()
+	{
+		if(isset($this->details['goal_revenue'])){
+			return $this->details['goal_revenue'];
+		}
+		return false;
+	}
+
+	function getGoalUrl()
+	{
+		if(isset($this->details['goal_idaction_url'])){
+			return $this->details['goal_idaction_url'];
+		}
+		return false;
+	}
+
+	function getGoalTimePretty()
+	{
+		if(isset($this->details['goal_server_time'])){
+			return $this->details['goal_server_time'];
+		}
+		return false;
+	}
 }