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

Commit 9182a45

Browse files
kristof-ringleffkristof-ringleff
committed
0.18.2 Release
1 parent 766ae48 commit 9182a45

File tree

6 files changed

+32
-33
lines changed

6 files changed

+32
-33
lines changed

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,31 +106,28 @@ public function getEcommPValue()
106106
*/
107107
public function getPageValue()
108108
{
109-
$values = array();
110109
switch ($this->getPageType()) {
111110
case self::GA_PAGETYPE_PRODUCT:
112111
return $this->getEcommPValue();
113112
break;
114113
case self::GA_PAGETYPE_CART:
114+
$value = 0;
115115
$quote = Mage::getSingleton('checkout/session')->getQuote();
116116
if (count($quote->getAllVisibleItems())) {
117117
foreach ($quote->getAllVisibleItems() as $basketItem) {
118-
$values[] = sprintf(
119-
'%01.2f', Mage::helper('googleanalyticsplus')->convert($basketItem, 'row_total')
120-
);
118+
$value += Mage::helper('googleanalyticsplus')->convert($basketItem, 'row_total_incl_tax');
121119
}
122120
}
123-
return $this->getArrayReturnValue($values, '0.00');
121+
return sprintf('%01.2f', $value);
124122
break;
125123
case self::GA_PAGETYPE_PURCHASE:
124+
$value = 0;
126125
if ($this->_getOrder()) {
127126
foreach ($this->_getOrder()->getAllVisibleItems() as $orderItem) {
128-
$values[] = sprintf(
129-
'%01.2f', Mage::helper('googleanalyticsplus')->convert($orderItem, 'row_total')
130-
);
127+
$value += Mage::helper('googleanalyticsplus')->convert($orderItem, 'row_total_incl_tax');
131128
}
132129
}
133-
return $this->getArrayReturnValue($values, '0.00');
130+
return sprintf('%01.2f', $value);
134131
}
135132
return false;
136133
}

‎app/code/community/Fooman/GoogleAnalyticsPlus/Helper/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ public function convert($object, $field, $currentCurrency = null)
4949
}
5050

5151
if (!Mage::getStoreConfig('google/analyticsplus/convertcurrencyenabled')) {
52-
return $baseValue;
52+
sprintf('%01.2f', $baseValue);
5353
}
5454

5555
return sprintf(
56-
"%01.4f", Mage::app()->getStore()->roundPrice(
56+
"%01.2f", Mage::app()->getStore()->roundPrice(
5757
$baseCur->convert(
5858
$baseValue,
5959
Mage::getStoreConfig('google/analyticsplus/convertcurrency')

‎app/code/community/Fooman/GoogleAnalyticsPlus/Model/Selftester.php

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class Fooman_GoogleAnalyticsPlus_Model_Selftester extends Fooman_Common_Model_Selftester
44
{
55

6-
const MANUAL_URL = 'http://cdn.fooman.co.nz/media/custom/upload/UserManual-FoomanGoogleAnalyticsPlus.pdf';
6+
const MANUAL_URL = 'https://store.fooman.co.nz/to/GoogleAnalyticsPlus/manual';
77

88
public function getManualLink()
99
{
@@ -14,31 +14,36 @@ public function _getFiles()
1414
{
1515
//REPLACE
1616
return array(
17+
'app/design/frontend/base/default/layout/googleanalyticsplus.xml',
18+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/tagmanager_head.phtml',
19+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/tagmanager.phtml',
20+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/ajax-tracking.phtml',
21+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/optout.phtml',
22+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/universal.phtml',
23+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/ga-conversion.phtml',
24+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/universal-send.phtml',
25+
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/remarketing.phtml',
1726
'app/etc/modules/Fooman_GoogleAnalyticsPlus.xml',
18-
'app/code/community/Fooman/GoogleAnalyticsPlus/Helper/Data.php',
1927
'app/code/community/Fooman/GoogleAnalyticsPlus/etc/system.xml',
2028
'app/code/community/Fooman/GoogleAnalyticsPlus/etc/config.xml',
21-
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Universal.php',
22-
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Remarketing.php',
23-
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/TagManager.php',
24-
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/GaConversion.php',
25-
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Adminhtml/Extensioninfo.php',
26-
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Ajax.php',
27-
'app/code/community/Fooman/GoogleAnalyticsPlus/LICENSE.txt',
29+
'app/code/community/Fooman/GoogleAnalyticsPlus/Model/Source/Productattribute.php',
2830
'app/code/community/Fooman/GoogleAnalyticsPlus/Model/Backend/Accountnumber.php',
2931
'app/code/community/Fooman/GoogleAnalyticsPlus/Model/Selftester.php',
30-
'app/code/community/Fooman/GoogleAnalyticsPlus/Model/Source/Productattribute.php',
3132
'app/code/community/Fooman/GoogleAnalyticsPlus/Model/Observer.php',
33+
'app/code/community/Fooman/GoogleAnalyticsPlus/Model/System/Dimension.php',
3234
'app/code/community/Fooman/GoogleAnalyticsPlus/Model/System/Language.php',
35+
'app/code/community/Fooman/GoogleAnalyticsPlus/LICENSE.txt',
36+
'app/code/community/Fooman/GoogleAnalyticsPlus/Helper/Data.php',
37+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Remarketing.php',
38+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/GaConversion.php',
39+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Ajax.php',
40+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/OptOut.php',
41+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Universal.php',
42+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/TagManagerHead.php',
43+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/TagManager.php',
44+
'app/code/community/Fooman/GoogleAnalyticsPlus/Block/Adminhtml/Extensioninfo.php',
3345
'app/code/community/Fooman/GoogleAnalyticsPlus/sql/googleanalyticsplus_setup/mysql4-install-0.0.1.php',
3446
'app/code/community/Fooman/GoogleAnalyticsPlus/sql/googleanalyticsplus_setup/mysql4-upgrade-0.14.1-0.14.2.php',
35-
'app/design/frontend/base/default/layout/googleanalyticsplus.xml',
36-
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/universal.phtml',
37-
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/ajax-tracking.phtml',
38-
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/ga-conversion.phtml',
39-
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/remarketing.phtml',
40-
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/universal-send.phtml',
41-
'app/design/frontend/base/default/template/fooman/googleanalyticsplus/tagmanager.phtml',
4247
);
4348
//REPLACE_END
4449
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<config>
33
<modules>
44
<Fooman_GoogleAnalyticsPlus>
5-
<version>0.18.0</version>
5+
<version>0.18.2</version>
66
</Fooman_GoogleAnalyticsPlus>
77
</modules>
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<show_in_store>1</show_in_store>
3030
<comment><![CDATA[<br />
3131
<div class="box">
32-
<p>For detailed instructions please refer to the Google Analytics + User Manual <a href="http://cdn.fooman.co.nz/media/custom/upload/UserManual-FoomanGoogleAnalyticsPlus.pdf" target="_blank">here</a>.</p>
32+
<p>For detailed instructions please refer to the Google Analytics + User Manual <a href="https://store.fooman.co.nz/to/GoogleAnalyticsPlus/manual" target="_blank">here</a>.</p>
3333
</div>
3434
]]>
3535
</comment>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
ecomm_prodid: <?php echo $prodId ?>,
1515
<?php endif;?>
1616
ecomm_pagetype: '<?php echo $pageType ?>',
17-
<?php if($this->getEcommPValue()):?>
18-
ecomm_pvalue: <?php echo $this->getEcommPValue() ?>,
19-
<?php endif;?>
2017
<?php if($this->getEcommCategory()):?>
2118
ecomm_category: '<?php echo $this->jsQuoteEscape($this->getEcommCategory()) ?>',
2219
<?php endif;?>

0 commit comments

Comments
 (0)