Version Notes
Integration of econda Web Controlling functions.
Download this release
Release Info
Developer | ecdev |
Extension | Mage_Econda |
Version | 1.5.8 |
Comparing to | |
See all releases |
Code changes from version 1.5.7 to 1.5.8
app/code/local/Mage/Econda/Block/Econda.php
CHANGED
@@ -125,7 +125,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
|
|
125 |
/**
|
126 |
* Save pageID, siteID and langID into session for onePageCheckout
|
127 |
*/
|
128 |
-
$jsSessionData = $contentPath.','.$siteName.','.$
|
129 |
$session->setData('econda_content',$jsSessionData);
|
130 |
|
131 |
/**
|
@@ -237,7 +237,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
|
|
237 |
/**
|
238 |
* Display script code
|
239 |
*/
|
240 |
-
$emosString = "\n\n<!-- Start Econda-Monitor
|
241 |
$emosString .= $emos->toString();
|
242 |
$emosString .= "<!-- End Econda-Monitor -->\n\n";
|
243 |
|
125 |
/**
|
126 |
* Save pageID, siteID and langID into session for onePageCheckout
|
127 |
*/
|
128 |
+
$jsSessionData = $contentPath.','.$siteName.','.$langName;
|
129 |
$session->setData('econda_content',$jsSessionData);
|
130 |
|
131 |
/**
|
237 |
/**
|
238 |
* Display script code
|
239 |
*/
|
240 |
+
$emosString = "\n\n<!-- Start Econda-Monitor M158 -->\n";
|
241 |
$emosString .= $emos->toString();
|
242 |
$emosString .= "<!-- End Econda-Monitor -->\n\n";
|
243 |
|
app/code/local/Mage/Econda/Block/EcondaOp.php
CHANGED
@@ -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\n<!-- Start Econda-Monitor
|
70 |
$emosOut .= "<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\n<!-- Start Econda-Monitor M158 -->\n";
|
70 |
$emosOut .= "<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
@@ -556,7 +556,7 @@ class Mage_Econda_Block_Emos
|
|
556 |
if($this->ecString == "") {
|
557 |
$this->ecString .= " emospro.ec_Event = [\n";
|
558 |
}
|
559 |
-
$this->ecString .= " ['".$event."','".$item->productID."','".$item->productName."','".$item->price."','".$item->productGroup."','".$item->quantity."','".$item->variant1."','".$item->variant2."','".$item->
|
560 |
}
|
561 |
else { //anchor tags
|
562 |
$item = $this->emos_ItemFormat($item);
|
@@ -662,7 +662,7 @@ class Mage_Econda_Block_Emos
|
|
662 |
}
|
663 |
foreach ($basket as $item) {
|
664 |
$item = $this->emos_ItemFormat($item);
|
665 |
-
$this->ecString .= " ['".$event."','".$item->productID."','".$item->productName."','".$item->price."','".$item->productGroup."','".$item->quantity."','".$item->variant1."','".$item->variant2."','".$item->
|
666 |
}
|
667 |
}
|
668 |
else {
|
556 |
if($this->ecString == "") {
|
557 |
$this->ecString .= " emospro.ec_Event = [\n";
|
558 |
}
|
559 |
+
$this->ecString .= " ['".$event."','".$item->productID."','".$item->productName."','".$item->price."','".$item->productGroup."','".$item->quantity."','".$item->variant1."','".$item->variant2."','".$item->variant3."'],\n";
|
560 |
}
|
561 |
else { //anchor tags
|
562 |
$item = $this->emos_ItemFormat($item);
|
662 |
}
|
663 |
foreach ($basket as $item) {
|
664 |
$item = $this->emos_ItemFormat($item);
|
665 |
+
$this->ecString .= " ['".$event."','".$item->productID."','".$item->productName."','".$item->price."','".$item->productGroup."','".$item->quantity."','".$item->variant1."','".$item->variant2."','".$item->variant3."'],\n";
|
666 |
}
|
667 |
}
|
668 |
else {
|
app/code/local/Mage/Econda/Model/Base.php
CHANGED
@@ -100,8 +100,7 @@ class Mage_Econda_Model_Base extends Mage_Core_Model_Abstract
|
|
100 |
$siteName = trim($siteidOv);
|
101 |
}
|
102 |
else {
|
103 |
-
$
|
104 |
-
$siteName = preg_replace(array('/(http:\/\/|https:\/\/)/','/index.php/','/\//'),array('','',''),$homeUrl);
|
105 |
}
|
106 |
return $siteName;
|
107 |
}
|
100 |
$siteName = trim($siteidOv);
|
101 |
}
|
102 |
else {
|
103 |
+
$siteName = Mage::app()->getFrontController()->getRequest()->getHttpHost();
|
|
|
104 |
}
|
105 |
return $siteName;
|
106 |
}
|
app/code/local/Mage/Econda/etc/config.xml
CHANGED
@@ -11,7 +11,7 @@
|
|
11 |
<config>
|
12 |
<modules>
|
13 |
<Mage_Econda>
|
14 |
-
<version>1.5.
|
15 |
</Mage_Econda>
|
16 |
</modules>
|
17 |
<frontend>
|
11 |
<config>
|
12 |
<modules>
|
13 |
<Mage_Econda>
|
14 |
+
<version>1.5.8</version>
|
15 |
</Mage_Econda>
|
16 |
</modules>
|
17 |
<frontend>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Mage_Econda</name>
|
4 |
-
<version>1.5.
|
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>orgonflow</user><email>bebop30@gmx.net</email></author></authors>
|
13 |
-
<date>2012-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Mage_Econda</name>
|
4 |
+
<version>1.5.8</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>orgonflow</user><email>bebop30@gmx.net</email></author></authors>
|
13 |
+
<date>2012-04-12</date>
|
14 |
+
<time>10:13:12</time>
|
15 |
+
<contents><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="405cb381d5fda0350758d36d527e86ae"/><file name="EcondaOp.php" hash="f491c765cde512b0c29fdc6dbe810c06"/><file name="Emos.php" hash="c52641f152e4f75898f1eecbf9135ba0"/></dir><dir name="Helper"><file name="Data.php" hash="2d50748fa3d1808ea099972920978608"/></dir><dir name="Model"><file name="Base.php" hash="06bd83bfe7560cbbf38ed41d3c048745"/><file name="Basket.php" hash="fc5a6522971b1285992ac80bc3941b7e"/><file name="Item.php" hash="9618a9100ea8dc320117eb085f1a3e8f"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Billing.php" hash="76be1f2dd15b4a5ef0da884b8b14064a"/><file name="Langid.php" hash="3a7417848f5290bdfd847be1048f0282"/><file name="Language.php" hash="9213fdd301cd1bd06cc2d630b8a48f17"/><file name="Siteid.php" hash="8ba8e62ef049507f7a16217b7dc5bb52"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="9894c7cd3562ebaef26cfa7a303c3250"/><file name="system.xml" hash="43ca0ce2beb54570037c035005fc2163"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="1fce4699f3f8c3cf285a77514a59dd9f"/></dir></dir><dir name="layout"><file name="econda.xml" hash="abb9e9cebc5c19beb3e3adbca92d9785"/></dir></dir></dir><dir name="base"><dir name="default"><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="1fce4699f3f8c3cf285a77514a59dd9f"/></dir></dir><dir name="layout"><file name="econda.xml" hash="abb9e9cebc5c19beb3e3adbca92d9785"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Econda.xml" hash="a2b5aef713dd6df06ec41792ce51adf9"/></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="228bdef1308a698a0c864f43aac4a717"/><file name="emos2.js" hash="9063366f40aa9cb4065d5f1091a47f6a"/></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Mage_Econda.csv" hash="de7eaf349d6691de31ce3c878e55400a"/></dir><dir name="de_AT"><file name="Mage_Econda.csv" hash="de7eaf349d6691de31ce3c878e55400a"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="de7eaf349d6691de31ce3c878e55400a"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="40739a9b0e7638e83173a952b738a0dd"/></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
18 |
</package>
|