Skip to content

Commit 752debd

Browse files
fballianofballiano
authored
Removed support for Google Analytics3 and Universal Analytics (OpenMage#3347)
1 parent f43a033 commit 752debd

File tree

6 files changed

+11
-276
lines changed

6 files changed

+11
-276
lines changed

‎app/code/core/Mage/GoogleAnalytics/Block/Ga.php

Lines changed: 7 additions & 208 deletions
Original file line numberDiff line numberDiff line change
@@ -21,47 +21,6 @@
2121
*/
2222
class Mage_GoogleAnalytics_Block_Ga extends Mage_Core_Block_Template
2323
{
24-
/**
25-
* @deprecated after 1.4.1.1
26-
* @see self::_getOrdersTrackingCode()
27-
* @return string
28-
*/
29-
public function getQuoteOrdersHtml()
30-
{
31-
return '';
32-
}
33-
34-
/**
35-
* @deprecated after 1.4.1.1
36-
* self::_getOrdersTrackingCode()
37-
* @return string
38-
*/
39-
public function getOrderHtml()
40-
{
41-
return '';
42-
}
43-
44-
/**
45-
* @deprecated after 1.4.1.1
46-
* @see _toHtml()
47-
* @return string
48-
*/
49-
public function getAccount()
50-
{
51-
return '';
52-
}
53-
54-
/**
55-
* Get a specific page name (may be customized via layout)
56-
*
57-
* @return string
58-
* @deprecated
59-
*/
60-
public function getPageName()
61-
{
62-
return $this->_getData('page_name') ?? '';
63-
}
64-
6524
/**
6625
* Render regular page tracking javascript code
6726
* The custom "page name" may be set from layout or somewhere else. It must start from slash.
@@ -75,11 +34,9 @@ protected function _getPageTrackingCode($accountId)
7534
$helper = $this->helper('googleanalytics');
7635
if ($helper->isUseAnalytics4()) {
7736
return $this->_getPageTrackingCodeAnalytics4($accountId);
78-
} elseif ($helper->isUseUniversalAnalytics()) {
79-
return $this->_getPageTrackingCodeUniversal($accountId);
80-
} else {
81-
return $this->_getPageTrackingCodeAnalytics($accountId);
8237
}
38+
39+
return '';
8340
}
8441

8542
/**
@@ -125,14 +82,11 @@ protected function _getPageTrackingCodeAnalytics4($accountId)
12582
*
12683
* @param string $accountId
12784
* @return string
85+
* @deprecated
12886
*/
12987
protected function _getPageTrackingCodeUniversal($accountId)
13088
{
131-
return "
132-
ga('create', '{$this->jsQuoteEscape($accountId)}', 'auto');
133-
" . $this->_getAnonymizationCode() . "
134-
ga('send', 'pageview');
135-
";
89+
return '';
13690
}
13791

13892
/**
@@ -143,19 +97,11 @@ protected function _getPageTrackingCodeUniversal($accountId)
14397
* @link http://code.google.com/apis/analytics/docs/gaJS/gaJSApi_gaq.html
14498
* @param string $accountId
14599
* @return string
100+
* @deprecated
146101
*/
147102
protected function _getPageTrackingCodeAnalytics($accountId)
148103
{
149-
$pageName = trim($this->getPageName());
150-
$optPageURL = '';
151-
if ($pageName && preg_match('/^\/.*/i', $pageName)) {
152-
$optPageURL = ", '{$this->jsQuoteEscape($pageName)}'";
153-
}
154-
return "
155-
_gaq.push(['_setAccount', '{$this->jsQuoteEscape($accountId)}']);
156-
" . $this->_getAnonymizationCode() . "
157-
_gaq.push(['_trackPageview'{$optPageURL}]);
158-
";
104+
return '';
159105
}
160106

161107
/**
@@ -170,65 +116,9 @@ protected function _getOrdersTrackingCode()
170116
$helper = $this->helper('googleanalytics');
171117
if ($helper->isUseAnalytics4()) {
172118
return $this->_getOrdersTrackingCodeAnalytics4();
173-
} elseif ($helper->isUseUniversalAnalytics()) {
174-
return $this->_getOrdersTrackingCodeUniversal();
175119
}
176120

177-
return $this->_getOrdersTrackingCodeAnalytics();
178-
}
179-
180-
/**
181-
* Render information about specified orders and their items
182-
*
183-
* @return string
184-
* @throws Mage_Core_Model_Store_Exception
185-
*/
186-
protected function _getOrdersTrackingCodeUniversal()
187-
{
188-
$orderIds = $this->getOrderIds();
189-
if (empty($orderIds) || !is_array($orderIds)) {
190-
return;
191-
}
192-
$collection = Mage::getResourceModel('sales/order_collection')
193-
->addFieldToFilter('entity_id', ['in' => $orderIds]);
194-
$result = [];
195-
$result[] = "ga('require', 'ecommerce')";
196-
foreach ($collection as $order) {
197-
$result[] = sprintf(
198-
"ga('ecommerce:addTransaction', {
199-
'id': '%s',
200-
'affiliation': '%s',
201-
'revenue': '%s',
202-
'tax': '%s',
203-
'shipping': '%s'
204-
});",
205-
$order->getIncrementId(),
206-
$this->jsQuoteEscape(Mage::app()->getStore()->getFrontendName()),
207-
$order->getBaseGrandTotal(),
208-
$order->getBaseTaxAmount(),
209-
$order->getBaseShippingAmount()
210-
);
211-
foreach ($order->getAllVisibleItems() as $item) {
212-
$result[] = sprintf(
213-
"ga('ecommerce:addItem', {
214-
'id': '%s',
215-
'sku': '%s',
216-
'name': '%s',
217-
'category': '%s',
218-
'price': '%s',
219-
'quantity': '%s'
220-
});",
221-
$order->getIncrementId(),
222-
$this->jsQuoteEscape($item->getSku()),
223-
$this->jsQuoteEscape($item->getName()),
224-
null, // there is no "category" defined for the order item
225-
$item->getBasePrice(),
226-
$item->getQtyOrdered()
227-
);
228-
}
229-
$result[] = "ga('ecommerce:send');";
230-
}
231-
return implode("\n", $result);
121+
return '';
232122
}
233123

234124
/**
@@ -501,97 +391,6 @@ protected function _getOrdersTrackingCodeAnalytics4()
501391
}
502392

503393
/**
504-
* Render information about specified orders and their items
505-
*
506-
* @link http://code.google.com/apis/analytics/docs/gaJS/gaJSApiEcommerce.html#_gat.GA_Tracker_._addTrans
507-
* @return string
508-
* @throws Mage_Core_Model_Store_Exception
509-
*/
510-
protected function _getOrdersTrackingCodeAnalytics()
511-
{
512-
$orderIds = $this->getOrderIds();
513-
if (empty($orderIds) || !is_array($orderIds)) {
514-
return;
515-
}
516-
$collection = Mage::getResourceModel('sales/order_collection')
517-
->addFieldToFilter('entity_id', ['in' => $orderIds]);
518-
$result = [];
519-
foreach ($collection as $order) {
520-
if ($order->getIsVirtual()) {
521-
$address = $order->getBillingAddress();
522-
} else {
523-
$address = $order->getShippingAddress();
524-
}
525-
$result[] = sprintf(
526-
"_gaq.push(['_addTrans', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s']);",
527-
$order->getIncrementId(),
528-
$this->jsQuoteEscape(Mage::app()->getStore()->getFrontendName()),
529-
$order->getBaseGrandTotal(),
530-
$order->getBaseTaxAmount(),
531-
$order->getBaseShippingAmount(),
532-
$this->jsQuoteEscape(Mage::helper('core')->escapeHtml($address->getCity())),
533-
$this->jsQuoteEscape(Mage::helper('core')->escapeHtml($address->getRegion())),
534-
$this->jsQuoteEscape(Mage::helper('core')->escapeHtml($address->getCountry()))
535-
);
536-
foreach ($order->getAllVisibleItems() as $item) {
537-
$result[] = sprintf(
538-
"_gaq.push(['_addItem', '%s', '%s', '%s', '%s', '%s', '%s']);",
539-
$order->getIncrementId(),
540-
$this->jsQuoteEscape($item->getSku()),
541-
$this->jsQuoteEscape($item->getName()),
542-
null, // there is no "category" defined for the order item
543-
$item->getBasePrice(),
544-
$item->getQtyOrdered()
545-
);
546-
}
547-
$result[] = "_gaq.push(['_trackTrans']);";
548-
}
549-
return implode("\n", $result);
550-
}
551-
552-
/**
553-
* Render IP anonymization code for page tracking javascript code
554-
*
555-
* @return string
556-
*/
557-
protected function _getAnonymizationCode()
558-
{
559-
if (!Mage::helper('googleanalytics')->isIpAnonymizationEnabled()) {
560-
return '';
561-
}
562-
563-
/** @var Mage_GoogleAnalytics_Helper_Data $helper */
564-
$helper = $this->helper('googleanalytics');
565-
if ($helper->isUseUniversalAnalytics()) {
566-
return $this->_getAnonymizationCodeUniversal();
567-
}
568-
569-
return $this->_getAnonymizationCodeAnalytics();
570-
}
571-
572-
/**
573-
* Render IP anonymization code for page tracking javascript universal analytics code
574-
*
575-
* @return string
576-
*/
577-
protected function _getAnonymizationCodeUniversal()
578-
{
579-
return "ga('set', 'anonymizeIp', true);";
580-
}
581-
582-
/**
583-
* Render IP anonymization code for page tracking javascript google analytics code
584-
*
585-
* @return string
586-
*/
587-
protected function _getAnonymizationCodeAnalytics()
588-
{
589-
return "_gaq.push (['_gat._anonymizeIp']);";
590-
}
591-
592-
/**
593-
* Is ga available
594-
*
595394
* @return bool
596395
*/
597396
protected function _isAvailable()

‎app/code/core/Mage/GoogleAnalytics/Helper/Data.php

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract
2727
public const XML_PATH_ACTIVE = 'google/analytics/active';
2828
public const XML_PATH_TYPE = 'google/analytics/type';
2929
public const XML_PATH_ACCOUNT = 'google/analytics/account';
30-
public const XML_PATH_ANONYMIZATION = 'google/analytics/anonymization';
3130
public const XML_PATH_DEBUG = 'google/analytics/debug';
3231
public const XML_PATH_USERID = 'google/analytics/user_id';
3332

@@ -37,17 +36,8 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract
3736
public const TYPE_ANALYTICS4 = 'analytics4';
3837

3938
/**
40-
* @var string classic google analytics tracking code
41-
* @deprecated
39+
* @var string
4240
*/
43-
public const TYPE_ANALYTICS = 'analytics';
44-
45-
/**
46-
* @var string google analytics universal tracking code
47-
* @deprecated
48-
*/
49-
public const TYPE_UNIVERSAL = 'universal';
50-
5141
protected $_moduleName = 'Mage_GoogleAnalytics';
5242

5343
/**
@@ -67,10 +57,11 @@ public function isGoogleAnalyticsAvailable($store = null)
6757
*
6858
* @param null|string|bool|int|Mage_Core_Model_Store $store $store
6959
* @return bool
60+
* @deprecated
7061
*/
7162
public function isIpAnonymizationEnabled($store = null)
7263
{
73-
return Mage::getStoreConfigFlag(self::XML_PATH_ANONYMIZATION, $store);
64+
return false;
7465
}
7566

7667
/**
@@ -93,7 +84,7 @@ public function getAccountId($store = null)
9384
*/
9485
public function isUseUniversalAnalytics($store = null)
9586
{
96-
return Mage::getStoreConfig(self::XML_PATH_TYPE, $store) == self::TYPE_UNIVERSAL;
87+
return false;
9788
}
9889

9990
/**

‎app/code/core/Mage/GoogleAnalytics/Model/Observer.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
*/
2222
class Mage_GoogleAnalytics_Model_Observer
2323
{
24-
/**
25-
* Create Google Analytics block for success page view
26-
*
27-
* @deprecated after 1.3.2.3 Use setGoogleAnalyticsOnOrderSuccessPageView() method instead
28-
* @param Varien_Event_Observer $observer
29-
*/
30-
// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
31-
public function order_success_page_view($observer)
32-
{
33-
$this->setGoogleAnalyticsOnOrderSuccessPageView($observer);
34-
}
35-
3624
/**
3725
* Add order information into GA block to render on checkout success pages
3826
*

‎app/code/core/Mage/GoogleAnalytics/Model/System/Config/Source/Type.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ public function toOptionArray()
3232
[
3333
'value' => Mage_GoogleAnalytics_Helper_Data::TYPE_ANALYTICS4,
3434
'label' => Mage::helper('googleanalytics')->__('Google Analytics 4')
35-
],
36-
[
37-
'value' => Mage_GoogleAnalytics_Helper_Data::TYPE_ANALYTICS,
38-
'label' => Mage::helper('googleanalytics')->__('Google Analytics')
39-
],
40-
[
41-
'value' => Mage_GoogleAnalytics_Helper_Data::TYPE_UNIVERSAL,
42-
'label' => Mage::helper('googleanalytics')->__('Universal Analytics')
4335
]
4436
];
4537
}

‎app/code/core/Mage/GoogleAnalytics/sql/googleanalytics_setup/install-1.6.0.0.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎phpstan.dist.baseline.neon

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2925,16 +2925,6 @@ parameters:
29252925
count: 1
29262926
path: app/code/core/Mage/GiftMessage/controllers/IndexController.php
29272927

2928-
-
2929-
message: "#^Method Mage_GoogleAnalytics_Block_Ga\\:\\:_getOrdersTrackingCodeAnalytics\\(\\) should return string but empty return statement found\\.$#"
2930-
count: 1
2931-
path: app/code/core/Mage/GoogleAnalytics/Block/Ga.php
2932-
2933-
-
2934-
message: "#^Method Mage_GoogleAnalytics_Block_Ga\\:\\:_getOrdersTrackingCodeUniversal\\(\\) should return string but empty return statement found\\.$#"
2935-
count: 1
2936-
path: app/code/core/Mage/GoogleAnalytics/Block/Ga.php
2937-
29382928
-
29392929
message: "#^Return type \\(void\\) of method Mage_GoogleCheckout_Model_Payment\\:\\:authorize\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Abstract\\)\\) of method Mage_Payment_Model_Method_Abstract\\:\\:authorize\\(\\)$#"
29402930
count: 1

0 commit comments

Comments
 (0)