Mage_Econda - Version 1.5.1

Version Notes

Integration of econda Web Controlling functions.

Release Info

Developer	Magento Core Team
Extension	Mage_Econda
Version	1.5.1
Comparing to
See all releases

Code changes from version 1.5.0 to 1.5.1

Files changed (6) hide show

app/code/local/Mage/Econda/Block/Econda.php +1 -1
app/code/local/Mage/Econda/Block/EcondaOp.php +1 -1
app/code/local/Mage/Econda/Block/Emos.php +2 -2
app/code/local/Mage/Econda/etc/config.xml +1 -1
js/tracker/emosop.js +81 -77
package.xml +4 -4

app/code/local/Mage/Econda/Block/Econda.php CHANGED Viewed

	@@ -232,7 +232,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
232	/**
233	* Display script code
234	*/
235	- $emosString = "\n\n<!-- Start Econda-Monitor ~~M150~~ -->\n";
236	$emosString .= $emos->toString();
237	$emosString .= "<!-- End Econda-Monitor -->\n\n";
238


232	/**
233	* Display script code
234	*/
235	+ $emosString = "\n\n<!-- Start Econda-Monitor M151 -->\n";
236	$emosString .= $emos->toString();
237	$emosString .= "<!-- End Econda-Monitor -->\n\n";
238

app/code/local/Mage/Econda/Block/EcondaOp.php CHANGED Viewed

	@@ -66,7 +66,7 @@ class Mage_Econda_Block_EcondaOp extends Mage_Core_Block_Template
66	$emosLogin .= " emospro.login = [['".$customerId."','0']];\n";
67	$opsession->setData('econda_logged','2');
68	}
69	- $emosOut = "\n<!-- Start Econda-Monitor ~~M150~~ -->\n";
70	$emosOut .= "\n<script type=\"text/javascript\">\n//<![CDATA[\n";
71	$emosOut .= " window.emosTrackVersion = 2;\n";
72	$emosOut .= "//]]>\n</script>";


66	$emosLogin .= " emospro.login = [['".$customerId."','0']];\n";
67	$opsession->setData('econda_logged','2');
68	}
69	+ $emosOut = "\n<!-- Start Econda-Monitor M151 -->\n";
70	$emosOut .= "\n<script type=\"text/javascript\">\n//<![CDATA[\n";
71	$emosOut .= " window.emosTrackVersion = 2;\n";
72	$emosOut .= "//]]>\n</script>";

app/code/local/Mage/Econda/Block/Emos.php CHANGED Viewed

	@@ -125,7 +125,7 @@ class Mage_Econda_Block_Emos
125	private $jsStart = "<script type=\"text/javascript\">\n//<![CDATA[\n var emospro = {};\n";
126
127	/* end js and fire properties */
128	- private $jsEnd = " window.emosPropertiesEvent(emospro);\n//]]>\n</script>\n";
129
130	/* emos2 inclusion */
131	private $emosBib = "";
	@@ -319,7 +319,7 @@ class Mage_Econda_Block_Emos
319	$this->ecString = "";
320	}
321	if(!$this->emosFire) {
322	- $this->jsEnd = str_replace(" window.emosPropertiesEvent(emospro);\n","",$this->jsEnd);
323	}
324	if($this->rmvCdata) {
325	$this->jsStart = str_replace("\n//<![CDATA[","",$this->jsStart);


125	private $jsStart = "<script type=\"text/javascript\">\n//<![CDATA[\n var emospro = {};\n";
126
127	/* end js and fire properties */
128	+ private $jsEnd = " if(typeof(window.emosPropertiesEvent) == 'function') {\n window.emosPropertiesEvent(emospro);\n }\n//]]>\n</script>\n";
129
130	/* emos2 inclusion */
131	private $emosBib = "";

319	$this->ecString = "";
320	}
321	if(!$this->emosFire) {
322	+ $this->jsEnd = str_replace(" if(typeof(window.emosPropertiesEvent) == 'function') {\n window.emosPropertiesEvent(emospro);\n }\n","",$this->jsEnd);
323	}
324	if($this->rmvCdata) {
325	$this->jsStart = str_replace("\n//<![CDATA[","",$this->jsStart);

app/code/local/Mage/Econda/etc/config.xml CHANGED Viewed

	@@ -11,7 +11,7 @@
11	<config>
12	<modules>
13	<Mage_Econda>
14	- <version>1.5.0</version>
15	</Mage_Econda>
16	</modules>
17	<frontend>


11	<config>
12	<modules>
13	<Mage_Econda>
14	+ <version>1.5.1</version>
15	</Mage_Econda>
16	</modules>
17	<frontend>

js/tracker/emosop.js CHANGED Viewed

@@ -1,95 +1,99 @@
             // econda one page checkout helper
-            -
            // Copyright 2009-2020 econda GmnH
             var sendOne = 1;
             var orderProcess = '';
             var contentLabel = '';
-            -
            	// set event handler
-            -
            	if (document.addEventListener){
-            -
            		document.addEventListener("mousemove", onePageTracker, false);
-            -
            	}
-            -
            	else if (document.attachEvent){ //IE
-            -
            		document.attachEvent("onmousemove", onePageTracker);
-            -
            	}
-            -
            function onePageTracker() {
-            -
-            -
            	orderProcess = '';
-            -
            	contentLabel = '';
-            -
-            -
            	// content path for step 2 :login
-            -
            	if($('opc-login')) {
-            -
            		if(stristr($('opc-login').className,'active') != false && sendOne == 1) {
-            -
            			orderProcess = '2_' + ecStep[0];
-            -
            			contentLabel = ecStep[0];
-            -
            			sendOne += 1;
-            -
            		}
-            -
            	}
-            -
            	// content path for step 3 :billing
-            -
            	if($('opc-billing')) {
-            -
            	   if(stristr($('opc-billing').className,'active') != false && (sendOne == 1 || sendOne == 2)) {
-            -
            		  orderProcess = '3_' + ecStep[1];
-            -
            		  contentLabel = ecStep[6];
-            -
            		  if(typeof(emospro.login) != 'undefined') {
-            -
            		      delete emospro.login;
-            -
            		  }
-            -
            		  if(sendOne == 1) {
-            -
            			 sendOne += 1;
-            -
            		  }
-            -
            		  sendOne += 1;
-            -
            	   }
-            -
            	}
-            -
            	// content path for step 4 :shipping
-            -
            	if($('opc-shipping')) {
-            -
            	   if(stristr($('opc-shipping').className,'active') != false && sendOne == 3) {
-            -
            		  orderProcess = '4_' + ecStep[2];
-            -
            		  contentLabel = ecStep[2];
-            -
            		  sendOne += 1;
-            -
            	   }
-            -
            	}
-            -
            	// content path for step 4 :shipping/method
-            -
            	if($('opc-shipping_method')) {
-            -
            	   if(stristr($('opc-shipping_method').className,'active') != false && (sendOne == 3 || sendOne == 4)) {
-            -
            		  orderProcess = '4_' + ecStep[3];
-            -
            		  contentLabel = ecStep[3];
-            -
            		  if(sendOne == 3) {
-            -
            			 sendOne += 1;
-            -
            		  }
-            -
            		  sendOne += 1;
-            -
            	   }
-            -
            	}
-            -
            	// content path for step 5 :payment
-            -
            	if($('opc-payment')) {
-            -
            	   if(stristr($('opc-payment').className,'active') != false && sendOne == 5) {
-            -
            		  orderProcess = '5_' + ecStep[4];
-            -
            		  contentLabel = ecStep[4];
-            -
            		  sendOne += 1;
-            -
            	   }
-            -
            	}
-            -
            	// content path for step 6 :order review
-            -
            	if($('opc-review')) {
-            -
            	   if(stristr($('opc-review').className,'active') != false && sendOne == 6) {
-            -
            		  orderProcess = '6_' + ecStep[5];
-            -
            		  contentLabel = ecStep[5];
-            -
            		  sendOne += 1;
-            -
            	   }
-            -
            	}
-            -
            	// send content path and order process step
-            -
            	if (orderProcess != '') {
-            -
            		emospro.orderProcess=orderProcess;
-            -
            		emospro.content='Start/' + ecStep[7] + '/' + contentLabel;
-            -
            		window.emosPropertiesEvent(emospro);
-            -
            	}
+            }
             // stristr helper function
-            -
            function stristr(haystack,needle,bool) {
                 var pos = 0;
                 haystack += '';
                 pos = haystack.toLowerCase().indexOf( (needle+'').toLowerCase() );


1	// econda one page checkout helper
2	+ // Copyright 2009-2010 econda GmbH
3	var sendOne = 1;
4	var orderProcess = '';
5	var contentLabel = '';
6
7	+ // set event handler
8	+ if (document.addEventListener){
9	+ document.addEventListener("mousemove", onePageTracker, false);
10	+ }
11	+ else if (document.attachEvent){ //IE
12	+ document.attachEvent("onmousemove", onePageTracker);
13	+ }
14
15	+ // get checkout steps
16	+ function onePageTracker()
17	+ {
18	+ orderProcess = '';
19	+ contentLabel = '';
20	+
21	+ // content path for step 2 :login
22	+ if($('opc-login')) {
23	+ if(stristr($('opc-login').className,'active') != false && sendOne == 1) {
24	+ orderProcess = '2_' + ecStep[0];
25	+ contentLabel = ecStep[0];
26	+ sendOne += 1;
27	+ }
28	+ }
29
30	+ // content path for step 3 :billing
31	+ if($('opc-billing')) {
32	+ if(stristr($('opc-billing').className,'active') != false && (sendOne == 1 \|\| sendOne == 2)) {
33	+ orderProcess = '3_' + ecStep[1];
34	+ contentLabel = ecStep[6];
35	+ if(typeof(emospro.login) != 'undefined') {
36	+ delete emospro.login;
37	+ }
38	+ if(sendOne == 1) {
39	+ sendOne += 1;
40	+ }
41	+ sendOne += 1;
42	+ }
43	+ }
44
45	+ // content path for step 4 :shipping
46	+ if($('opc-shipping')) {
47	+ if(stristr($('opc-shipping').className,'active') != false && sendOne == 3) {
48	+ orderProcess = '4_' + ecStep[2];
49	+ contentLabel = ecStep[2];
50	+ sendOne += 1;
51	+ }
52	+ }
53
54	+ // content path for step 4 :shipping/method
55	+ if($('opc-shipping_method')) {
56	+ if(stristr($('opc-shipping_method').className,'active') != false && (sendOne == 3 \|\| sendOne == 4)) {
57	+ orderProcess = '4_' + ecStep[3];
58	+ contentLabel = ecStep[3];
59	+ if(sendOne == 3) {
60	+ sendOne += 1;
61	+ }
62	+ sendOne += 1;
63	+ }
64	+ }
65
66	+ // content path for step 5 :payment
67	+ if($('opc-payment')) {
68	+ if(stristr($('opc-payment').className,'active') != false && sendOne == 5) {
69	+ orderProcess = '5_' + ecStep[4];
70	+ contentLabel = ecStep[4];
71	+ sendOne += 1;
72	+ }
73	+ }
74
75	+ // content path for step 6 :order review
76	+ if($('opc-review')) {
77	+ if(stristr($('opc-review').className,'active') != false && sendOne == 6) {
78	+ orderProcess = '6_' + ecStep[5];
79	+ contentLabel = ecStep[5];
80	+ sendOne += 1;
81	+ }
82	+ }
83
84	+ // send content path and order process step
85	+ if (orderProcess != '') {
86	+ emospro.orderProcess=orderProcess;
87	+ emospro.content='Start/' + ecStep[7] + '/' + contentLabel;
88	+ if(typeof(window.emosPropertiesEvent) == 'function') {
89	+ window.emosPropertiesEvent(emospro);
90	+ }
91	+ }
92	}
93
94	// stristr helper function
95	+ function stristr(haystack,needle,bool)
96	+ {
97	var pos = 0;
98	haystack += '';
99	pos = haystack.toLowerCase().indexOf( (needle+'').toLowerCase() );

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Mage_Econda</name>
4	- <version>1.5.0</version>
5	<stability>stable</stability>
6	<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
7	<channel>community</channel>
	@@ -10,9 +10,9 @@
10	<description>Bindet econda Web Shop Controlling in Magento ein. Weitere Informationen unter http://www.econda.de. Inserts econda Web Shop Contolling into Magento. For further information visit http://www.econda.de/</description>
11	<notes>Integration of econda Web Controlling functions.</notes>
12	<authors><author><name>ecdev</name><user>auto-converted</user><email>bebop30@gmx.net</email></author></authors>
13	- <date>2010-11-30</date>
14	- <time>15:50:43</time>
15	- <contents><target name="magelocale"><dir name="de_AT"><file name="Mage_Econda.csv" hash="3d7fa85b5b0937ed6aebdeacd4baee86"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="3d7fa85b5b0937ed6aebdeacd4baee86"/></dir><dir name="de_DE"><file name="Mage_Econda.csv" hash="3d7fa85b5b0937ed6aebdeacd4baee86"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="19027c08d453acf6f88d9d4866203a94"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="econda.xml" hash="b0c38c0677e67f47a58598b2848b8a8d"/></dir><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="949b7ba912ace52437b44bd1708f8e8d"/></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="econda.xml" hash="b0c38c0677e67f47a58598b2848b8a8d"/></dir><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="949b7ba912ace52437b44bd1708f8e8d"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="~~ef3953dc5307171d64044f289f41fdc5~~"/></dir></dir></target><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="~~8d0df509aac1bc1f3528118829d91f48~~"/><file name="EcondaOp.php" hash="~~75ad6064344e41b3b4edb72bd5182fd7~~"/><file name="Emos.php" hash="~~800c128f4d25bd5de5d6c537add75c51~~"/></dir><dir name="etc"><file name="config.xml" hash="~~b19ee9b2d5e0abe817c7d7dbf02ecac6~~"/><file name="system.xml" hash="4db59b306e24dc6ca1337f78b2d4d371"/></dir><dir name="Helper"><file name="Data.php" hash="853ff137bd34927316c360f9bfd98b37"/></dir><dir name="Model"><file name="Base.php" hash="6ebd768c3c059a0a4f3ca8125be0257d"/><file name="Basket.php" hash="e780d6aed18b977c7aedd7844db2184d"/><file name="Item.php" hash="ec9e41386d7484523b4073a029774858"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Billing.php" hash="a7cabf3a167e3c2b4d38c70a3eeb8677"/><file name="Language.php" hash="a06353607d539124f6725ec66b4f923e"/><file name="Siteid.php" hash="e39acc175981011b1a6db39c78a43b44"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Econda.xml" hash="95c63a559ee5a021eba480dfbb72f7de"/></dir></target></contents>
16	<compatible/>
17	<dependencies/>
18	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Mage_Econda</name>
4	+ <version>1.5.1</version>
5	<stability>stable</stability>
6	<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
7	<channel>community</channel>

10	<description>Bindet econda Web Shop Controlling in Magento ein. Weitere Informationen unter http://www.econda.de. Inserts econda Web Shop Contolling into Magento. For further information visit http://www.econda.de/</description>
11	<notes>Integration of econda Web Controlling functions.</notes>
12	<authors><author><name>ecdev</name><user>auto-converted</user><email>bebop30@gmx.net</email></author></authors>
13	+ <date>2010-12-02</date>
14	+ <time>10:18:16</time>
15	+ <contents><target name="magelocale"><dir name="de_AT"><file name="Mage_Econda.csv" hash="3d7fa85b5b0937ed6aebdeacd4baee86"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="3d7fa85b5b0937ed6aebdeacd4baee86"/></dir><dir name="de_DE"><file name="Mage_Econda.csv" hash="3d7fa85b5b0937ed6aebdeacd4baee86"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="19027c08d453acf6f88d9d4866203a94"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="econda.xml" hash="b0c38c0677e67f47a58598b2848b8a8d"/></dir><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="949b7ba912ace52437b44bd1708f8e8d"/></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="layout"><file name="econda.xml" hash="b0c38c0677e67f47a58598b2848b8a8d"/></dir><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="949b7ba912ace52437b44bd1708f8e8d"/></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="80fd5d48652da74ad8d3b22165ad7ddf"/></dir></dir></target><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="d007452d380db9b7e5b90161bbef0b14"/><file name="EcondaOp.php" hash="b4e3f6683d63b33c50ac34b4e9823242"/><file name="Emos.php" hash="778803bb77ba463c0fa19d39b87e022e"/></dir><dir name="etc"><file name="config.xml" hash="3dbd6940df209636fa7176dd9502b375"/><file name="system.xml" hash="4db59b306e24dc6ca1337f78b2d4d371"/></dir><dir name="Helper"><file name="Data.php" hash="853ff137bd34927316c360f9bfd98b37"/></dir><dir name="Model"><file name="Base.php" hash="6ebd768c3c059a0a4f3ca8125be0257d"/><file name="Basket.php" hash="e780d6aed18b977c7aedd7844db2184d"/><file name="Item.php" hash="ec9e41386d7484523b4073a029774858"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Billing.php" hash="a7cabf3a167e3c2b4d38c70a3eeb8677"/><file name="Language.php" hash="a06353607d539124f6725ec66b4f923e"/><file name="Siteid.php" hash="e39acc175981011b1a6db39c78a43b44"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Econda.xml" hash="95c63a559ee5a021eba480dfbb72f7de"/></dir></target></contents>
16	<compatible/>
17	<dependencies/>
18	</package>