Merge pull request #2 from markguinn/patch-1

Quick fix to bug in universal analytics
burnbright · Jul 21, 2015 · 568de78 · 568de78
2 parents c558a07 + 2df3bf4
commit 568de78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/code/ShopGoogleAnalytics.php b/code/ShopGoogleAnalytics.php
@@ -45,7 +45,7 @@ class ShopGoogleAnalytics extends Object
 	 * @return string
 	 */
 	public static function get_property_id() {
-		if (self::config()->disable_on_dev && !\Director::isLive()){
+		if (self::config()->disable_on_dev && !Director::isLive()) {
 			return '';	
 		}
 

diff --git a/code/ShopGoogleAnalyticsController.php b/code/ShopGoogleAnalyticsController.php
@@ -45,7 +45,10 @@ public function addGASnippet($name, $order = false) {
 		$snippets = $cfg->tracking_code;
 
 		if (isset($snippets[$type]) && isset($snippets[$type][$name])) {
-			$js = $this->owner->renderWith($snippets[$type][$name], array('Order' => $order));
+			$js = $this->owner->renderWith($snippets[$type][$name], array(
+				'Order' => $order,
+				'GAWebPropertyID' => $this->GAWebPropertyID(),
+			));
 		}
 
 		if (!empty($js)) {

diff --git a/templates/GAConversion.ss b/templates/GAConversion.ss
@@ -4,7 +4,7 @@ ga('require', 'ecommerce');
 	ga('ecommerce:addTransaction', {
 		'id':           '$JS_val(Reference)',
 		'affiliation':  '$Top.SiteConfig.JS_val(Title)',
-		'revenue':      '$Total.RAW'
+		'revenue':      '$Total.RAW',
 		'shipping':     '$GAShippingTotal',
 		'tax':          '$GATaxTotal',
 	});