Mage_Econda - Version 1.0.2

Version Notes

Release for econda Web Controlling functions.

Download this release

Release Info

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


Code changes from version 1.0.1 to 1.0.2

Files changed (2) hide show
  1. app/code/local/Mage/Econda/Block/Econda.php +5 -14
  2. package.xml +4 -4
app/code/local/Mage/Econda/Block/Econda.php CHANGED
@@ -57,7 +57,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
57
 
58
  public function getEmos() {
59
 
60
- require ('emos.php');
61
  $storeId = $this->getStore();
62
  $langValue = 'econda/econda/tracking_language';
63
  $langPath = Mage::getStoreConfig($langValue, $storeId);
@@ -71,7 +71,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
71
  else {
72
  $langFile = 'german';
73
  }
74
- require_once ('app/code/local/Mage/Econda/Language/'.$langFile.'.php');
75
 
76
  /*
77
  * path to emos2.js
@@ -82,7 +82,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
82
  /*
83
  * start of emos string
84
  */
85
- $emosString = "\n\n<!-- Start Econda-Monitor -->\n\n";
86
 
87
  $emos = new EMOS($pathToFile);
88
 
@@ -134,7 +134,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
134
  $stepCheckout = 'PAYMENT';
135
  }
136
  if(stristr($realUrl,'checkout/multishipping/overview/') != false) {
137
- $contentCheckout = $eLang[6];
138
  $stepCheckout = 'REVIEW';
139
  }
140
  if(stristr($realUrl,'checkout/multishipping/success/') != false || stristr($realUrl,'checkout/onepage/success/') != false || stristr($realUrl,'uospayment/success/') != false) {
@@ -658,13 +658,4 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
658
  $corPrice = str_replace('.','',$corPrice);
659
  return $corPrice.'.'.substr($price,-2);
660
  }
661
-
662
- private function pageUrl() {
663
-
664
- $protocol = ((int) $_SERVER['SERVER_PORT'] === 443)? 'https://' : 'http://';
665
- $current_page = $protocol . $_SERVER['HTTP_HOST'] . ((!empty($_SERVER['REQUEST_URI']))? $_SERVER['REQUEST_URI'] : '');
666
-
667
- return $current_page;
668
- }
669
-
670
- }
57
 
58
  public function getEmos() {
59
 
60
+ require Mage::getModuleDir('', 'Mage_Econda').DS.'Block'.DS.'emos.php';
61
  $storeId = $this->getStore();
62
  $langValue = 'econda/econda/tracking_language';
63
  $langPath = Mage::getStoreConfig($langValue, $storeId);
71
  else {
72
  $langFile = 'german';
73
  }
74
+ require Mage::getModuleDir('', 'Mage_Econda').DS.'Language'.DS.$langFile.'.php';
75
 
76
  /*
77
  * path to emos2.js
82
  /*
83
  * start of emos string
84
  */
85
+ $emosString = "\n\n<!-- Start Econda-Monitor M102 -->\n\n";
86
 
87
  $emos = new EMOS($pathToFile);
88
 
134
  $stepCheckout = 'PAYMENT';
135
  }
136
  if(stristr($realUrl,'checkout/multishipping/overview/') != false) {
137
+ $contentCheckout = $eLang[36];
138
  $stepCheckout = 'REVIEW';
139
  }
140
  if(stristr($realUrl,'checkout/multishipping/success/') != false || stristr($realUrl,'checkout/onepage/success/') != false || stristr($realUrl,'uospayment/success/') != false) {
658
  $corPrice = str_replace('.','',$corPrice);
659
  return $corPrice.'.'.substr($price,-2);
660
  }
661
+ }
 
 
 
 
 
 
 
 
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Econda</name>
4
- <version>1.0.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 Controlling in Magento ein. Weitere Informationen unter http://www.econda.de. Inserts econda Web Contolling into Magento. For further information visit http://www.econda.de/</description>
11
  <notes>Release for econda Web Controlling functions.</notes>
12
  <authors><author><name>ecdev</name><user>auto-converted</user><email>bebop30@gmx.net</email></author></authors>
13
- <date>2009-06-25</date>
14
- <time>14:34:00</time>
15
- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="econda.xml" hash="cbb5b0bc56602498ea5fc0af88a847ab"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="econda.xml" hash="7997011c0987fd24178f27f2c9a89fc4"/></dir><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="f3f4a75988775e652255a27b19a190ba"/><file name="trackerop.phtml" hash="9f423e8db39a5f926bac9373b72631e4"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_AT"><file name="Mage_Econda.csv" hash="d34ccda243a4d5422e78e271c5582701"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="d34ccda243a4d5422e78e271c5582701"/></dir><dir name="de_DE"><file name="Mage_Econda.csv" hash="d34ccda243a4d5422e78e271c5582701"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="b6c45b488af70218583ba61764f43fce"/></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="ed5590349e9654766f42fb63d47a7366"/></dir></dir></target><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="db83e52eec7940261e8134831d9cdeec"/><file name="emos.php" hash="9724a5fd1c5bcb3066d22f60a59acab8"/><dir name="Adminhtml"><file name="Econda.php" hash="dfe2f3270e832a0f9952e262a26a12ee"/><file name="Tracker.php" hash="9a8820c2f5d1b105dfeb023926e0d368"/><dir name="Econda"><file name="Edit.php" hash="43a19bcffd20b3e4c4b497503f7adf2a"/><file name="Grid.php" hash="d92771738a4e196a9ebb255e94e5c8eb"/><dir name="Edit"><file name="Form.php" hash="8e765540fc4aaaf487cbc976b74147bc"/><file name="Tabs.php" hash="86e7ac45dfaa6ac89e30c709f5311538"/><dir name="Tab"><file name="Form.php" hash="eb9530cada5105bf190b927b970744b7"/></dir></dir></dir><dir name="Tracker"><file name="Edit.php" hash="c0496415a5f1d0021b1d2d2313ed0eff"/><file name="Grid.php" hash="3318d472ac71cce739696b287cb81557"/><dir name="Edit"><file name="Form.php" hash="f292fa68f4782eadcac34d757fdce073"/><file name="Tabs.php" hash="c02f68b55b22d77158b841c89af5b230"/><dir name="Tab"><file name="Form.php" hash="3f463742e5f9c61e88c929c70502bf22"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="253cbb1316220834b9c6222792e59fc4"/><dir name="Adminhtml"><file name="EcondaController.php" hash="8dad3d7cb5ec59fadc5bb1ba5aafae14"/><file name="TrackerController.php" hash="12fdf5c3b1c9ca04cc899faf3272a3e0"/></dir></dir><dir name="etc"><file name="config.xml" hash="9e928ac5aece32953dc5b43d9108ffdc"/><file name="system.xml" hash="9f2cd7c5625ceb7221223f63bb6339da"/></dir><dir name="Helper"><file name="Data.php" hash="a2e8e8cc0b42886d8e7fdf6239ac5180"/></dir><dir name="Language"><file name="english.php" hash="d0fa9b08a9cfb9e7c5e8003a5839a22f"/><file name="german.php" hash="d181289a8024e2b4d9f69150fad54ddc"/></dir><dir name="Model"><file name="Econda.php" hash="2129423b43edaa5ad86ca1ce2925f4d5"/><file name="Status.php" hash="8c73ee6feba08a3a9c9cf73105751cbd"/><dir name="Mysql4"><file name="Econda.php" hash="9e3244467bdb6bef7519e90c7b8b9dd8"/><file name="Tracker.php" hash="d0493cdc60d3b3fd7d3e548480641823"/><dir name="Econda"><file name="Collection.php" hash="78207d4301d2d3b6a63121f8b57ae989"/></dir><dir name="Tracker"><file name="Collection.php" hash="411183409afca6ec33aff08fa4884d0f"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Language.php" hash="d125200a9df69489692c606f2452e351"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Econda.xml" hash="4857a6367896368610cda11f31de2822"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Econda</name>
4
+ <version>1.0.2</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 Controlling in Magento ein. Weitere Informationen unter http://www.econda.de. Inserts econda Web Contolling into Magento. For further information visit http://www.econda.de/</description>
11
  <notes>Release for econda Web Controlling functions.</notes>
12
  <authors><author><name>ecdev</name><user>auto-converted</user><email>bebop30@gmx.net</email></author></authors>
13
+ <date>2009-09-04</date>
14
+ <time>12:06:11</time>
15
+ <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="econda.xml" hash="cbb5b0bc56602498ea5fc0af88a847ab"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="econda.xml" hash="7997011c0987fd24178f27f2c9a89fc4"/></dir><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="f3f4a75988775e652255a27b19a190ba"/><file name="trackerop.phtml" hash="9f423e8db39a5f926bac9373b72631e4"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_AT"><file name="Mage_Econda.csv" hash="d34ccda243a4d5422e78e271c5582701"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="d34ccda243a4d5422e78e271c5582701"/></dir><dir name="de_DE"><file name="Mage_Econda.csv" hash="d34ccda243a4d5422e78e271c5582701"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="b6c45b488af70218583ba61764f43fce"/></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="ed5590349e9654766f42fb63d47a7366"/></dir></dir></target><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="959be2b3c764faba9f530ce23bbd36d9"/><file name="emos.php" hash="9724a5fd1c5bcb3066d22f60a59acab8"/><dir name="Adminhtml"><file name="Econda.php" hash="dfe2f3270e832a0f9952e262a26a12ee"/><file name="Tracker.php" hash="9a8820c2f5d1b105dfeb023926e0d368"/><dir name="Econda"><file name="Edit.php" hash="43a19bcffd20b3e4c4b497503f7adf2a"/><file name="Grid.php" hash="d92771738a4e196a9ebb255e94e5c8eb"/><dir name="Edit"><file name="Form.php" hash="8e765540fc4aaaf487cbc976b74147bc"/><file name="Tabs.php" hash="86e7ac45dfaa6ac89e30c709f5311538"/><dir name="Tab"><file name="Form.php" hash="eb9530cada5105bf190b927b970744b7"/></dir></dir></dir><dir name="Tracker"><file name="Edit.php" hash="c0496415a5f1d0021b1d2d2313ed0eff"/><file name="Grid.php" hash="3318d472ac71cce739696b287cb81557"/><dir name="Edit"><file name="Form.php" hash="f292fa68f4782eadcac34d757fdce073"/><file name="Tabs.php" hash="c02f68b55b22d77158b841c89af5b230"/><dir name="Tab"><file name="Form.php" hash="3f463742e5f9c61e88c929c70502bf22"/></dir></dir></dir></dir></dir><dir name="controllers"><file name="IndexController.php" hash="253cbb1316220834b9c6222792e59fc4"/><dir name="Adminhtml"><file name="EcondaController.php" hash="8dad3d7cb5ec59fadc5bb1ba5aafae14"/><file name="TrackerController.php" hash="12fdf5c3b1c9ca04cc899faf3272a3e0"/></dir></dir><dir name="etc"><file name="config.xml" hash="9e928ac5aece32953dc5b43d9108ffdc"/><file name="system.xml" hash="9f2cd7c5625ceb7221223f63bb6339da"/></dir><dir name="Helper"><file name="Data.php" hash="a2e8e8cc0b42886d8e7fdf6239ac5180"/></dir><dir name="Language"><file name="english.php" hash="d0fa9b08a9cfb9e7c5e8003a5839a22f"/><file name="german.php" hash="d181289a8024e2b4d9f69150fad54ddc"/></dir><dir name="Model"><file name="Econda.php" hash="2129423b43edaa5ad86ca1ce2925f4d5"/><file name="Status.php" hash="8c73ee6feba08a3a9c9cf73105751cbd"/><dir name="Mysql4"><file name="Econda.php" hash="9e3244467bdb6bef7519e90c7b8b9dd8"/><file name="Tracker.php" hash="d0493cdc60d3b3fd7d3e548480641823"/><dir name="Econda"><file name="Collection.php" hash="78207d4301d2d3b6a63121f8b57ae989"/></dir><dir name="Tracker"><file name="Collection.php" hash="411183409afca6ec33aff08fa4884d0f"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Language.php" hash="d125200a9df69489692c606f2452e351"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Econda.xml" hash="4857a6367896368610cda11f31de2822"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>