Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 9e35138

Browse files
foomanfooman
committed
0.15.1 Release
1 parent 9935e32 commit 9e35138

File tree

6 files changed

+87
-20
lines changed

6 files changed

+87
-20
lines changed

‎app/code/community/Fooman/GoogleAnalyticsPlus/Block/Common/Abstract.php

+11-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public function getAlternativeAccountId()
170170
}
171171

172172
/**
173-
* get Google Analytics account id
173+
* get Google Analytics universal account id
174174
*
175175
* @return mixed
176176
*/
@@ -179,6 +179,16 @@ public function getUniversalAccount()
179179
return Mage::getStoreConfig('google/analyticsplus_universal/accountnumber');
180180
}
181181

182+
/**
183+
* get Google Analytics universal account id for alternative profile
184+
*
185+
* @return mixed
186+
*/
187+
public function getAlternativeUniversalAccount()
188+
{
189+
return Mage::getStoreConfig('google/analyticsplus_universal/altaccountnumber');
190+
}
191+
182192
/**
183193
* are we using universal
184194
*

‎app/code/community/Fooman/GoogleAnalyticsPlus/Block/Universal.php

+8-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*/
1313
class Fooman_GoogleAnalyticsPlus_Block_Universal extends Fooman_GoogleAnalyticsPlus_Block_GaConversion
1414
{
15+
const TRACKER_TWO_NAME = 'tracker2';
16+
1517
protected function _construct()
1618
{
1719
parent::_construct();
@@ -55,9 +57,11 @@ public function getUniversalAnonymise()
5557
/**
5658
* Build any params that is passed on create of analytics object
5759
*
60+
* @param bool $createTrackerTwo
61+
*
5862
* @return string
5963
*/
60-
public function getUniversalParams()
64+
public function getUniversalParams($createTrackerTwo = false)
6165
{
6266
$params = array();
6367
if (Mage::getStoreConfig('google/analyticsplus_universal/domainname')) {
@@ -66,6 +70,9 @@ public function getUniversalParams()
6670
if ($this->canUseUniversalUserTracking()) {
6771
$params['userId'] = $this->getCustomerId();
6872
}
73+
if ($createTrackerTwo) {
74+
$params['name'] = self::TRACKER_TWO_NAME;
75+
}
6976
if (count($params) == 0) {
7077
return "'auto'";
7178
}

‎app/code/community/Fooman/GoogleAnalyticsPlus/etc/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<config>
33
<modules>
44
<Fooman_GoogleAnalyticsPlus>
5-
<version>0.15.0</version>
5+
<version>0.15.1</version>
66
</Fooman_GoogleAnalyticsPlus>
77
</modules>
88

‎app/code/community/Fooman/GoogleAnalyticsPlus/etc/system.xml

+9
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,15 @@
167167
<show_in_website>1</show_in_website>
168168
<show_in_store>1</show_in_store>
169169
</accountnumber>
170+
<altaccountnumber translate="label">
171+
<label>Account Number (alternative Profile)</label>
172+
<comment/>
173+
<frontend_type>text</frontend_type>
174+
<sort_order>150</sort_order>
175+
<show_in_default>1</show_in_default>
176+
<show_in_website>1</show_in_website>
177+
<show_in_store>1</show_in_store>
178+
</altaccountnumber>
170179
<anonymise translate="label">
171180
<label>Anonymise IP Address</label>
172181
<comment><![CDATA[See <a href="https://support.google.com/analytics/answer/2763052?hl=en">Google Documentation</a> for details]]></comment>

‎app/design/frontend/base/default/template/fooman/googleanalyticsplus/ajax-tracking.phtml

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
this.classic = settings.classic;
1010
this.altClassic = settings.altClassic;
1111
this.universal = settings.universal;
12+
this.altUniversal = settings.altUniversal;
1213
},
1314
trackEvent: function(section){
1415

@@ -22,6 +23,9 @@
2223
if (this.universal) {
2324
ga('send', 'pageview', urlToTrack);
2425
}
26+
if (this.altUniversal) {
27+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.send', 'pageview', urlToTrack);
28+
}
2529
}
2630
}
2731

@@ -30,7 +34,8 @@
3034
pageQuery: '<?php echo $this->getPageQuery() ?>',
3135
classic: '<?php echo $this->getMainAccountId() ?>',
3236
altClassic: '<?php echo $this->getAlternativeAccountId() ?>',
33-
universal: '<?php echo $this->isUniversalEnabled() ? $this->getUniversalAccount():'' ?>'
37+
universal: '<?php echo $this->isUniversalEnabled() ? $this->getUniversalAccount():'' ?>',
38+
altUniversal: '<?php echo $this->isUniversalEnabled() ? $this->getAlternativeUniversalAccount():'' ?>'
3439
}
3540
);
3641

‎app/design/frontend/base/default/template/fooman/googleanalyticsplus/universal.phtml

+52-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php if ($this->shouldInclude()): ?>
2+
<?php $altUniversal = $this->getAlternativeUniversalAccount(); ?>
23
<!-- Google Analytics -->
34
<script>
45
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -7,40 +8,75 @@
78
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
89

910
ga('create', '<?php echo $this->getUniversalAccount(); ?>',<?php echo $this->getUniversalParams(); ?>);
11+
<?php if ($altUniversal):?>
12+
ga('create', '<?php echo $altUniversal; ?>',<?php echo $this->getUniversalParams(true); ?>);
13+
<?php endif;?>
14+
1015
<?php if($this->getUniversalAnonymise()):?>
1116
ga('set', 'anonymizeIp', true);
17+
<?php if ($altUniversal):?>
18+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.set', 'anonymizeIp', true);
19+
<?php endif;?>
1220
<?php endif;?>
1321
<?php if($this->getUniversalDisplayAdvertising()):?>
1422
ga('require', 'displayfeatures'<?php if($this->getUniversalDisplayAdvertisingCookieName()):?>, undefined, { cookieName: '<?php echo $this->getUniversalDisplayAdvertisingCookieName(); ?>' }<?php endif; ?>);
23+
<?php if ($altUniversal):?>
24+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.require', 'displayfeatures'<?php if($this->getUniversalDisplayAdvertisingCookieName()):?>, undefined, { cookieName: '<?php echo $this->getUniversalDisplayAdvertisingCookieName(); ?>' }<?php endif; ?>);
25+
<?php endif;?>
1526
<?php endif;?>
1627
ga('send', 'pageview', '<?php echo $this->getPageName(); ?>');
28+
<?php if ($altUniversal):?>
29+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.send', 'pageview', '<?php echo $this->getPageName(); ?>');
30+
<?php endif;?>
1731

1832
</script>
1933
<?php if($this->isSuccessPage()):?>
2034
<?php $order = $this->_getOrder();?>
2135
<script>
2236
/* <![CDATA[ */
2337
ga('require', 'ecommerce', 'ecommerce.js');
38+
<?php if ($altUniversal):?>
39+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.require', 'ecommerce', 'ecommerce.js');
40+
<?php endif;?>
41+
42+
<?php $transactionDetails = "{
43+
'id': '".$this->jsQuoteEscape($order->getIncrementId()) ."',
44+
'affiliation': '". $this->jsQuoteEscape(Mage::app()->getStore()->getName()) ."',
45+
'revenue': '". Mage::helper('googleanalyticsplus')->convert($order, 'grand_total') ."',
46+
'shipping': '". Mage::helper('googleanalyticsplus')->convert($order, 'shipping_amount') ."',
47+
'tax': '". Mage::helper('googleanalyticsplus')->convert($order, 'tax_amount') ."',
48+
'currency': '". Mage::helper('googleanalyticsplus')->getTrackingCurrency($order) ."'
49+
}";
50+
?>
51+
52+
ga('ecommerce:addTransaction', <?php echo $transactionDetails?>);
53+
<?php if ($altUniversal):?>
54+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.ecommerce:addTransaction', <?php echo $transactionDetails?>);
55+
<?php endif;?>
56+
2457

25-
ga('ecommerce:addTransaction', {
26-
'id': '<?php echo $this->jsQuoteEscape($order->getIncrementId()) ?>',
27-
'affiliation': '<?php echo $this->jsQuoteEscape(Mage::app()->getStore()->getName()) ?>',
28-
'revenue': '<?php echo Mage::helper('googleanalyticsplus')->convert($order, 'grand_total') ?>',
29-
'shipping': '<?php echo Mage::helper('googleanalyticsplus')->convert($order, 'shipping_amount') ?>',
30-
'tax': '<?php echo Mage::helper('googleanalyticsplus')->convert($order, 'tax_amount') ?>',
31-
'currency': '<?php echo Mage::helper('googleanalyticsplus')->getTrackingCurrency($order) ?>'
32-
});
3358
<?php foreach ($order->getAllVisibleItems() as $item):?>
34-
ga('ecommerce:addItem', {
35-
'id': '<?php echo $this->jsQuoteEscape($order->getIncrementId()) ?>',
36-
'name': '<?php echo $this->jsQuoteEscape($item->getName())?>',
37-
'sku': '<?php echo $this->jsQuoteEscape($item->getSku())?>',
38-
'price': '<?php echo Mage::helper('googleanalyticsplus')->convert($item, 'price')?>',
39-
'quantity': '<?php echo (int)$item->getQtyOrdered()?>',
40-
'category': '<?php echo $this->jsQuoteEscape($this->getCategory($item))?>'
41-
});
59+
60+
<?php $itemDetails = "{
61+
'id': '".$this->jsQuoteEscape($order->getIncrementId()) ."',
62+
'name': '". $this->jsQuoteEscape($item->getName()) ."',
63+
'sku': '". $this->jsQuoteEscape($item->getSku()) ."',
64+
'price': '". Mage::helper('googleanalyticsplus')->convert($item, 'price') ."',
65+
'quantity': '". (int)$item->getQtyOrdered() ."',
66+
'category': '". $this->jsQuoteEscape($this->getCategory($item)) ."'
67+
}";
68+
?>
69+
70+
71+
ga('ecommerce:addItem', <?php echo $itemDetails?>);
72+
<?php if ($altUniversal):?>
73+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.ecommerce:addItem', <?php echo $itemDetails?>);
74+
<?php endif;?>
4275
<?php endforeach;?>
4376
ga('ecommerce:send');
77+
<?php if ($altUniversal):?>
78+
ga('<?php echo Fooman_GoogleAnalyticsPlus_Block_Universal::TRACKER_TWO_NAME?>.ecommerce:send');
79+
<?php endif;?>
4480
/* ]]> */
4581
</script>
4682
<?php endif; ?>

0 commit comments

Comments
 (0)