Mage_Econda - Version 1.6.6

Version Notes

Integration of econda Web Controlling functions.

Download this release

Release Info

Developer ecdev
Extension Mage_Econda
Version 1.6.6
Comparing to
See all releases


Code changes from version 1.6.5 to 1.6.6

Files changed (2) hide show
  1. app/code/local/Mage/Econda/Model/Basket.php +5 -10
  2. package.xml +4 -4
app/code/local/Mage/Econda/Model/Basket.php CHANGED
@@ -440,19 +440,14 @@ class Mage_Econda_Model_Basket extends Mage_Core_Model_Abstract
440
  stristr($this->realUrl,'uospayment/success/') != false) {//onepage
441
  $lastOrder = Mage::getSingleton('checkout/type_onepage')->getLastOrderId();
442
  $lastOrderId = $lastOrder;
443
- $quote = Mage::getSingleton('checkout/type_onepage')->getQuote();
444
- $entityId = $quote->getData('entity_id');
445
- // fallback if there is no result
446
- if(empty($entityId)) {
447
- $order = Mage::getModel('sales/order')->loadByIncrementId($lastOrderId);
448
- $entityId = $order->getQuoteId();
449
- }
450
  }
451
  else{//multipage
452
  $entityId = intval($this->session->getData('econda_order_id'));
453
  $orderIds = Mage::getSingleton('core/session')->getOrderIds(false);
454
  if($orderIds && is_array($orderIds)) {
455
- $lastOrderId = implode(' / ', $orderIds);
456
  }
457
  // fallback if there is no result
458
  else {
@@ -468,6 +463,7 @@ class Mage_Econda_Model_Basket extends Mage_Core_Model_Abstract
468
  $table = $prefix.'sales_flat_quote_address';
469
  $result = $db->query("SELECT customer_id,city,postcode,country_id,base_grand_total,base_subtotal,base_tax_amount,base_shipping_tax_amount FROM $table WHERE quote_id = $entityId AND address_type = 'shipping'");
470
  $priceTotal = 0;
 
471
  while($row = $result->fetch(PDO::FETCH_ASSOC)) {
472
  $custCountry = $row['country_id'];
473
  $custPostCode = $row['postcode'];
@@ -492,7 +488,6 @@ class Mage_Econda_Model_Basket extends Mage_Core_Model_Abstract
492
  }
493
  return null;
494
  }
495
-
496
  /**
497
  * Change price format for econda
498
  *
@@ -506,4 +501,4 @@ class Mage_Econda_Model_Basket extends Mage_Core_Model_Abstract
506
  $corPrice = str_replace('.','',$corPrice);
507
  return $corPrice.'.'.substr($price,-2);
508
  }
509
- }
440
  stristr($this->realUrl,'uospayment/success/') != false) {//onepage
441
  $lastOrder = Mage::getSingleton('checkout/type_onepage')->getLastOrderId();
442
  $lastOrderId = $lastOrder;
443
+ $order = Mage::getModel('sales/order')->loadByIncrementId($lastOrderId);
444
+ $entityId = $order->getQuoteId();
 
 
 
 
 
445
  }
446
  else{//multipage
447
  $entityId = intval($this->session->getData('econda_order_id'));
448
  $orderIds = Mage::getSingleton('core/session')->getOrderIds(false);
449
  if($orderIds && is_array($orderIds)) {
450
+ $lastOrderId = implode(' / ', $orderIds);
451
  }
452
  // fallback if there is no result
453
  else {
463
  $table = $prefix.'sales_flat_quote_address';
464
  $result = $db->query("SELECT customer_id,city,postcode,country_id,base_grand_total,base_subtotal,base_tax_amount,base_shipping_tax_amount FROM $table WHERE quote_id = $entityId AND address_type = 'shipping'");
465
  $priceTotal = 0;
466
+ $custId = 0;
467
  while($row = $result->fetch(PDO::FETCH_ASSOC)) {
468
  $custCountry = $row['country_id'];
469
  $custPostCode = $row['postcode'];
488
  }
489
  return null;
490
  }
 
491
  /**
492
  * Change price format for econda
493
  *
501
  $corPrice = str_replace('.','',$corPrice);
502
  return $corPrice.'.'.substr($price,-2);
503
  }
504
+ }
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Econda</name>
4
- <version>1.6.5</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 Analytics in Magento ein. Weitere Informationen unter http://www.econda.de. Inserts econda Web Analytics 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>ecmagento</user><email>reinecke@econda.de</email></author></authors>
13
- <date>2016-01-04</date>
14
- <time>16:57:24</time>
15
- <contents><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="1ae2d0fb73204b80056f3973dfea6778"/><file name="EcondaOp.php" hash="bb539330882621af25fc31e457a12c4a"/><file name="Emos.php" hash="c90acb2969f5f1a6f574079066f2a761"/></dir><dir name="Helper"><file name="Data.php" hash="5d0bdb6c2bb055f98710c9243ff2a066"/></dir><dir name="Model"><file name="Base.php" hash="58a963458d95a6af0c004a0ad432d9ac"/><file name="Basket.php" hash="cfeae19fbc2182fb1fd66f77454c0265"/><file name="Item.php" hash="5168097bd776dd2a99b316c0bd4e2b72"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Billing.php" hash="1ee0416a4aa84b0a082ba3807bf0e785"/><file name="Langid.php" hash="e3790bd42d325eadf5259f78f66fa3e0"/><file name="Language.php" hash="9e7a6599cb7cfadb542c32555e12a009"/><file name="Product.php" hash="1c1c1e5e4a050f0f9a87f5f658898fd3"/><file name="Siteid.php" hash="6e58bb6a4987a2e3010a9df539983a25"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="fb51c7df9ac510e66d339a4f45b4fe6f"/><file name="system.xml" hash="f583217cb09d6e8ebe089c8ebced5735"/></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="41023910444c55f23650384493d5008c"/></dir></dir><dir name="layout"><file name="econda.xml" hash="e87b667bf12976bac91829ffe64f288e"/></dir></dir></dir><dir name="base"><dir name="default"><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="41023910444c55f23650384493d5008c"/></dir></dir><dir name="layout"><file name="econda.xml" hash="e87b667bf12976bac91829ffe64f288e"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Econda.xml" hash="ac45b7219b3a8ca3d1e6f849093cf7eb"/></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="da04fb13b0756a0737c78247c73863bb"/></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Mage_Econda.csv" hash="942312acf13a4c973a47566b5ca37b1d"/></dir><dir name="de_AT"><file name="Mage_Econda.csv" hash="942312acf13a4c973a47566b5ca37b1d"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="942312acf13a4c973a47566b5ca37b1d"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="66a03ed8c951ee3c7f413d7e5c8419fc"/></dir></target></contents>
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.6.6</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 Analytics in Magento ein. Weitere Informationen unter http://www.econda.de. Inserts econda Web Analytics 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>ecmagento</user><email>reinecke@econda.de</email></author></authors>
13
+ <date>2016-03-03</date>
14
+ <time>14:49:12</time>
15
+ <contents><target name="magelocal"><dir name="Mage"><dir name="Econda"><dir name="Block"><file name="Econda.php" hash="1ae2d0fb73204b80056f3973dfea6778"/><file name="EcondaOp.php" hash="bb539330882621af25fc31e457a12c4a"/><file name="Emos.php" hash="c90acb2969f5f1a6f574079066f2a761"/></dir><dir name="Helper"><file name="Data.php" hash="5d0bdb6c2bb055f98710c9243ff2a066"/></dir><dir name="Model"><file name="Base.php" hash="58a963458d95a6af0c004a0ad432d9ac"/><file name="Basket.php" hash="7280f463d1055300bc150b8d2d037ce4"/><file name="Item.php" hash="5168097bd776dd2a99b316c0bd4e2b72"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Billing.php" hash="1ee0416a4aa84b0a082ba3807bf0e785"/><file name="Langid.php" hash="e3790bd42d325eadf5259f78f66fa3e0"/><file name="Language.php" hash="9e7a6599cb7cfadb542c32555e12a009"/><file name="Product.php" hash="1c1c1e5e4a050f0f9a87f5f658898fd3"/><file name="Siteid.php" hash="6e58bb6a4987a2e3010a9df539983a25"/></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="fb51c7df9ac510e66d339a4f45b4fe6f"/><file name="system.xml" hash="f583217cb09d6e8ebe089c8ebced5735"/></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="41023910444c55f23650384493d5008c"/></dir></dir><dir name="layout"><file name="econda.xml" hash="e87b667bf12976bac91829ffe64f288e"/></dir></dir></dir><dir name="base"><dir name="default"><dir name="template"><dir name="econda"><file name="tracker.phtml" hash="41023910444c55f23650384493d5008c"/></dir></dir><dir name="layout"><file name="econda.xml" hash="e87b667bf12976bac91829ffe64f288e"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Econda.xml" hash="ac45b7219b3a8ca3d1e6f849093cf7eb"/></dir></target><target name="mageweb"><dir name="js"><dir name="tracker"><file name="emosop.js" hash="da04fb13b0756a0737c78247c73863bb"/></dir></dir></target><target name="magelocale"><dir name="de_DE"><file name="Mage_Econda.csv" hash="942312acf13a4c973a47566b5ca37b1d"/></dir><dir name="de_AT"><file name="Mage_Econda.csv" hash="942312acf13a4c973a47566b5ca37b1d"/></dir><dir name="de_CH"><file name="Mage_Econda.csv" hash="942312acf13a4c973a47566b5ca37b1d"/></dir><dir name="en_US"><file name="Mage_Econda.csv" hash="66a03ed8c951ee3c7f413d7e5c8419fc"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>