Mage_Econda - Version 1.1.4

Version Notes

Release for econda Web Controlling functions.

Download this release

Release Info

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


Code changes from version 1.1.3 to 1.1.4

Files changed (3) hide show
  1. app/code/local/Mage/Econda/Block/Econda.php +14 -14
  2. app/code/local/Mage/Econda/etc/config.xml +1 -1
  3. package.xml +4 -4
app/code/local/Mage/Econda/Block/Econda.php CHANGED
@@ -101,7 +101,7 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
101
  /*
102
  * start of emos string
103
  */
104
- $emosString = "\n\n<!-- Start Econda-Monitor M113 -->\n\n";
105
 
106
  $emos = new EMOS($pathToFile);
107
 
@@ -611,26 +611,26 @@ class Mage_Econda_Block_Econda extends Mage_Core_Block_Template
611
  $row = $result->fetch(PDO::FETCH_ASSOC);
612
  $lastOrderId = $row['reserved_order_id'];
613
  }
614
- $tableSfqa = $tablePrefix.'sales_flat_quote_address';
615
- $result = $db->query("SELECT customer_id,city,postcode,country_id,grand_total,subtotal,tax_amount,shipping_tax_amount FROM $tableSfqa WHERE quote_id = $entityId and address_type = 'shipping'");
616
- $row = $result->fetch(PDO::FETCH_ASSOC);
617
- $custCountry = $row['country_id'];
618
- $custPostCode = $row['postcode'];
619
- $custCity = $row['city'];
620
- $custId = $row['customer_id'];
621
- $ordId = $lastOrderId;
622
  if(Mage::getStoreConfig($billingOption, $storeId) == '1') {
623
- $priceTotal = $row['subtotal'];
624
  }
625
  else if(Mage::getStoreConfig($billingOption, $storeId) == '2') {
626
- $priceTotal = $row['subtotal'] + $row['tax_amount'] - $row['shipping_tax_amount'];
627
  }
628
  else {
629
- $priceTotal = $row['grand_total'];
630
  }
631
  $priceTotal = $this->convertPrice($priceTotal);
632
- $custAdress = $custCountry.'/'.substr($custPostCode,0,1).'/'.substr($custPostCode,0,2).'/'.$custCity.'/'.$custPostCode;
633
- $emos->addEmosBillingPageArray($ordId,$custId,$priceTotal,$custCountry,$custPostCode,$custCity);
634
 
635
  /*
636
  * addEmosBasketPageArray checkout
101
  /*
102
  * start of emos string
103
  */
104
+ $emosString = "\n\n<!-- Start Econda-Monitor M114 -->\n\n";
105
 
106
  $emos = new EMOS($pathToFile);
107
 
611
  $row = $result->fetch(PDO::FETCH_ASSOC);
612
  $lastOrderId = $row['reserved_order_id'];
613
  }
614
+ $tableSfqa = $tablePrefix.'sales_flat_quote_address';
615
+ $result = $db->query("SELECT customer_id,city,postcode,country_id,base_grand_total,base_subtotal,base_tax_amount,base_shipping_tax_amount FROM $tableSfqa WHERE quote_id = $entityId and address_type = 'shipping'");
616
+ $row = $result->fetch(PDO::FETCH_ASSOC);
617
+ $custCountry = $row['country_id'];
618
+ $custPostCode = $row['postcode'];
619
+ $custCity = $row['city'];
620
+ $custId = $row['customer_id'];
621
+ $ordId = $lastOrderId;
622
  if(Mage::getStoreConfig($billingOption, $storeId) == '1') {
623
+ $priceTotal = $row['base_subtotal'];
624
  }
625
  else if(Mage::getStoreConfig($billingOption, $storeId) == '2') {
626
+ $priceTotal = $row['base_subtotal'] + $row['base_tax_amount'] - $row['base_shipping_tax_amount'];
627
  }
628
  else {
629
+ $priceTotal = $row['base_grand_total'];
630
  }
631
  $priceTotal = $this->convertPrice($priceTotal);
632
+ $custAdress = $custCountry.'/'.substr($custPostCode,0,1).'/'.substr($custPostCode,0,2).'/'.$custCity.'/'.$custPostCode;
633
+ $emos->addEmosBillingPageArray($ordId,$custId,$priceTotal,$custCountry,$custPostCode,$custCity);
634
 
635
  /*
636
  * addEmosBasketPageArray checkout
app/code/local/Mage/Econda/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Mage_Econda>
5
- <version>1.1.3</version>
6
  </Mage_Econda>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Mage_Econda>
5
+ <version>1.1.4</version>
6
  </Mage_Econda>
7
  </modules>
8
  <frontend>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Econda</name>
4
- <version>1.1.3</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>2010-03-25</date>
14
- <time>09:42:03</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="5515312a89fa5529c22b76bfe0396fa8"/><file name="trackerop.phtml" hash="dba2f8f060c7fdbffad02f13f518f95f"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_AT"><file name="Mage_Econda.csv" hash="cf3aeac031057a2e42d3e5dbb41ccf2f"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="cf3aeac031057a2e42d3e5dbb41ccf2f"/></dir><dir name="de_DE"><file name="Mage_Econda.csv" hash="cf3aeac031057a2e42d3e5dbb41ccf2f"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="9868c857164cf016232e8d75a6299501"/></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="ffedf0cf5e271d4e984ac6135cbfe2b8"/></dir></dir></target><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="0360c9d5921433b2621ae151a62cb5a6"/><file name="emos.php" hash="ce0028bd1b9230ab7e10df24e957a07a"/><file name="emos_org.php" hash="ce0028bd1b9230ab7e10df24e957a07a"/><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="e695ec11dc7cbbbc7451d393e3db1d6c"/><file name="system.xml" hash="30b602a82960bca4e3c0c50f77491cc5"/></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="Billing.php" hash="13b88fbca03555fc6e5ac8ce82cb0b63"/><file name="Language.php" hash="47d570575b7251fb0f022add31210de1"/><file name="Tracking.php" hash="0040d7a07d501751b8d589d25d98c99d"/></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.1.4</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>2010-04-01</date>
14
+ <time>08:20:51</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="5515312a89fa5529c22b76bfe0396fa8"/><file name="trackerop.phtml" hash="dba2f8f060c7fdbffad02f13f518f95f"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="de_AT"><file name="Mage_Econda.csv" hash="cf3aeac031057a2e42d3e5dbb41ccf2f"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="cf3aeac031057a2e42d3e5dbb41ccf2f"/></dir><dir name="de_DE"><file name="Mage_Econda.csv" hash="cf3aeac031057a2e42d3e5dbb41ccf2f"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="9868c857164cf016232e8d75a6299501"/></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="ffedf0cf5e271d4e984ac6135cbfe2b8"/></dir></dir></target><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="4e42c947fd75d52cd235853cc2a685b5"/><file name="emos.php" hash="ce0028bd1b9230ab7e10df24e957a07a"/><file name="emos_org.php" hash="ce0028bd1b9230ab7e10df24e957a07a"/><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="cf8f3fd51d329c4569281ab6ea428856"/><file name="system.xml" hash="30b602a82960bca4e3c0c50f77491cc5"/></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="Billing.php" hash="13b88fbca03555fc6e5ac8ce82cb0b63"/><file name="Language.php" hash="47d570575b7251fb0f022add31210de1"/><file name="Tracking.php" hash="0040d7a07d501751b8d589d25d98c99d"/></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>