refactoring; add anonymize flag to Magento\GoogleAnalytics\Block\Ga.p…

…hp->getOrdersTrackingCode
magento · Feb 4, 2017 · ed86a75 · ed86a75
1 parent f298ef5
commit ed86a75
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -80,14 +80,13 @@ public function getPageTrackingCode($accountId)
             $optPageURL = ", '" . $this->escapeHtmlAttr($pageName, false) . "'";
         }
 
-        $anonymizeIp = "false";
+        $anonymizeIp = "";
         if ($this->_googleAnalyticsData->isAnonymizedIpActive()) {
-          $anonymizeIp = "true";
+          $anonymizeIp = ", {'anonymizeIp': true}";
         }
 
-        return "\nga('create', '{$this->escapeJsQuote(
-            $accountId
-        )}', 'auto');\nga('send', 'pageview'{$optPageURL}, {'anonymizeIp' : {$anonymizeIp}});\n";
+        return "\nga('create', '" . $this->escapeHtmlAttr($accountId, false)
+           . ", 'auto');\nga('send', 'pageview'{$optPageURL}{$anonymizeIp});\n";
     }
 
     /**
@@ -111,6 +110,12 @@ public function getOrdersTrackingCode()
         $result = [];
 
         $result[] = "ga('require', 'ec', 'ec.js');";
+
+        $anonymizeIp = "";
+        if ($this->_googleAnalyticsData->isAnonymizedIpActive()) {
+          $anonymizeIp = ", {'anonymizeIp': true}";
+        }
+
         foreach ($collection as $order) {
             if ($order->getIsVirtual()) {
                 $address = $order->getBillingAddress();
@@ -148,7 +153,7 @@ public function getOrdersTrackingCode()
                 $order->getBaseShippingAmount()
             );
 
-            $result[] = "ga('send', 'pageview');";
+            $result[] = "ga('send', 'pageview'{$anonymizeIp});";
         }
         return implode("\n", $result);
     }