Auctionmaid_Matrxrate - Version 2.0.6

Version Notes

1 - The export csv option is currently disabled. This is so the extension does not conflict with the existing tablerates. There are no plans to resolve this - if you need to view the data look in phpmyadmin.

Download this release

Release Info

Developer Magento Core Team
Extension Auctionmaid_Matrxrate
Version 2.0.6
Comparing to
See all releases


Code changes from version 2.0.5 to 2.0.6

Files changed (3) hide show
  1. app/code/community/Auctionmaid/Matrixrate/Model/Carrier/Matrixrate.php +1 -5
  2. app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php +2 -1
  3. package.xml +4 -4
app/code/community/Auctionmaid/Matrixrate/Model/Carrier/Matrixrate.php CHANGED
@@ -57,14 +57,11 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
57
  }
58
 
59
 
60
- if (!$request->getConditionName()) {
61
- $request->setConditionName($this->getConfigData('condition_name') ? $this->getConfigData('condition_name') : $this->_default_condition_name);
62
- }
63
 
64
  $result = Mage::getModel('shipping/rate_result');
65
  $ratearray = $this->getRate($request);
66
 
67
- /** TODO Add check to ensure works when isnt an array **/
68
  $i=0;
69
  foreach ($ratearray as $rate)
70
  {
@@ -74,7 +71,6 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
74
  $method->setCarrier('matrixrate');
75
  $method->setCarrierTitle($this->getConfigData('title'));
76
 
77
- /* $method->setMethod($rate['delivery_type']);*/
78
  $method->setMethod('bestway'+$i);
79
 
80
  $method->setMethodTitle($rate['delivery_type']);
57
  }
58
 
59
 
60
+ $request->setConditionName($this->getConfigData('condition_name') ? $this->getConfigData('condition_name') : $this->_default_condition_name);
 
 
61
 
62
  $result = Mage::getModel('shipping/rate_result');
63
  $ratearray = $this->getRate($request);
64
 
 
65
  $i=0;
66
  foreach ($ratearray as $rate)
67
  {
71
  $method->setCarrier('matrixrate');
72
  $method->setCarrierTitle($this->getConfigData('title'));
73
 
 
74
  $method->setMethod('bestway'+$i);
75
 
76
  $method->setMethodTitle($rate['delivery_type']);
app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php CHANGED
@@ -231,6 +231,7 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_M
231
  }
232
 
233
  foreach ($csvLines as $k=>$csvLine) {
 
234
  $csvLine = $this->_getCsvValues($csvLine);
235
 
236
  if (empty($countryCodesToIds) || !array_key_exists($csvLine[0], $countryCodesToIds)) {
@@ -334,7 +335,7 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_M
334
 
335
  foreach($data as $k=>$dataLine) {
336
  try {
337
- $connection->insert($table, $dataLine);
338
  } catch (Exception $e) {
339
  $exceptions[] = Mage::helper('shipping')->__('Duplicate Row #%s (Country "%s", Region/State "%s", City "%s", Zip From "%s", Zip To "%s", Delivery Type "%s", Value From "%s" and Value To "%s")', ($k+1), $dataDetails[$k]['country'], $dataDetails[$k]['region'], $dataLine['dest_city'], $dataLine['dest_zip'], $dataLine['dest_zip_to'], $dataLine['delivery_type'], $dataLine['condition_from_value'], $dataLine['condition_to_value']);
340
  }
231
  }
232
 
233
  foreach ($csvLines as $k=>$csvLine) {
234
+
235
  $csvLine = $this->_getCsvValues($csvLine);
236
 
237
  if (empty($countryCodesToIds) || !array_key_exists($csvLine[0], $countryCodesToIds)) {
335
 
336
  foreach($data as $k=>$dataLine) {
337
  try {
338
+ $connection->insert($table, $dataLine);
339
  } catch (Exception $e) {
340
  $exceptions[] = Mage::helper('shipping')->__('Duplicate Row #%s (Country "%s", Region/State "%s", City "%s", Zip From "%s", Zip To "%s", Delivery Type "%s", Value From "%s" and Value To "%s")', ($k+1), $dataDetails[$k]['country'], $dataDetails[$k]['region'], $dataLine['dest_city'], $dataLine['dest_zip'], $dataLine['dest_zip_to'], $dataLine['delivery_type'], $dataLine['condition_from_value'], $dataLine['condition_to_value']);
341
  }
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctionmaid_Matrxrate</name>
4
- <version>2.0.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -20,9 +20,9 @@ Suitable for all countries incl UK, US, AUS, Europe.</summary>
20
  - collection only option</description>
21
  <notes>1 - The export csv option is currently disabled. This is so the extension does not conflict with the existing tablerates. There are no plans to resolve this - if you need to view the data look in phpmyadmin.</notes>
22
  <authors><author><name>Karen Baker</name><user>auto-converted</user><email>enquiries@auctionmaid.com</email></author></authors>
23
- <date>2009-04-25</date>
24
- <time>21:41:43</time>
25
- <contents><target name="magecommunity"><dir name="Auctionmaid"><dir name="Adminhtml"><dir name="Model"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><file name="Matrixrate.php" hash="3845daf2530ea28f4c1c9ef0896e4590"/></dir></dir><dir name="Source"><dir name="Shipping"><file name="Matrixrate.php" hash="bf0ab44901dacc3774a8afab91c08848"/></dir></dir></dir></dir></dir></dir><dir name="docs"><file name="AuctionMaid MatrixRate Shipping Module.pdf" hash="5046ebd65b62a3b66556d8efc8a9976a"/><file name="manual install.sql" hash="b1bf0f9b9597d64777a3704f8064b011"/></dir><dir name="example"><dir name="7-col"><file name="export_all_products.csv" hash="ee76a59cc041f80012dc547febaf5393"/><file name="tablerates - item tofrom.csv" hash="c21b4cbf21aefa5cc590ccd2ff073a04"/><file name="tablerates - price tofrom.csv" hash="834af0aeb1aa98abf91f637015f5e3ba"/><file name="tablerates - weight tofrom.csv" hash="c2d26d1097c6a6b1641353b548437421"/></dir><dir name="9-col"><file name="AusRanges.csv" hash="7884e9c2a15f495ce6a80091c38478b5"/><file name="weight postcode range.csv" hash="8b0f12598742f57a5444bfee16219603"/><file name="weight postcode starts with.csv" hash="b83d1c8f6798a42186a63116fc5575b3"/></dir></dir><dir name="Freeoptionalshipping"><dir name="etc"><file name="config.xml" hash="f450793ee1f015b5ea0d84ec910c3d76"/><file name="system.xml" hash="7f1fb48e01e1299bf449a769084bddbc"/></dir><dir name="Model"><dir name="Carrier"><file name="Freeoptionalshipping.php" hash="3faf036413d22a0dfc9edc7e12df7c1f"/></dir></dir></dir><dir name="Matrixrate"><dir name="etc"><file name="config.xml" hash="2fa5eb007a21cd14c06a51afe267a376"/><file name="system.xml" hash="cf1c8c2b472453da081c12cba74ef4d1"/></dir><dir name="Model"><dir name="Carrier"><file name="Matrixrate.php" hash="0b081cf566c4899573a74aa48bac7b8d"/></dir><dir name="Mysql4"><dir name="Carrier"><file name="Matrixrate.php" hash="70c95a5afe29e8a7bcbd832545b1a5e0"/><dir name="Matrixrate"><file name="Collection.php" hash="adf9282dce1467f2d47e68b4ecc49de9"/></dir></dir></dir></dir><dir name="sql"><dir name="matrixrate_setup"><file name="mysql4-install-1.0.5.php" hash="32ea533fd01276e78322ae734446dc93"/><file name="mysql4-install-2.0.0.php" hash="32ea533fd01276e78322ae734446dc93"/><file name="mysql4-install-2.0.1.php" hash="505940c2071753011f03a92a18fe6141"/><file name="mysql4-uninstall-2.0.0.php" hash="7efdd041b23194f1fbb9b0afc657bf1e"/><file name="mysql4-uninstall-2.0.1.php" hash="7efdd041b23194f1fbb9b0afc657bf1e"/><file name="mysql4-upgrade-2.0.0.php" hash="32ea533fd01276e78322ae734446dc93"/><file name="mysql4-upgrade-2.0.1.php" hash="505940c2071753011f03a92a18fe6141"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Auctionmaid_Freeoptionalshipping.xml" hash="a8bceecaca2402682f1713222ce23b4d"/><file name="Auctionmaid_Matrixrate.xml" hash="bde75a0463f7dc40affc8b2ce812ec91"/></dir></target></contents>
26
  <compatible/>
27
  <dependencies/>
28
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctionmaid_Matrxrate</name>
4
+ <version>2.0.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
20
  - collection only option</description>
21
  <notes>1 - The export csv option is currently disabled. This is so the extension does not conflict with the existing tablerates. There are no plans to resolve this - if you need to view the data look in phpmyadmin.</notes>
22
  <authors><author><name>Karen Baker</name><user>auto-converted</user><email>enquiries@auctionmaid.com</email></author></authors>
23
+ <date>2009-04-30</date>
24
+ <time>09:29:03</time>
25
+ <contents><target name="magecommunity"><dir name="Auctionmaid"><dir name="Adminhtml"><dir name="Model"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><file name="Matrixrate.php" hash="3845daf2530ea28f4c1c9ef0896e4590"/></dir></dir><dir name="Source"><dir name="Shipping"><file name="Matrixrate.php" hash="bf0ab44901dacc3774a8afab91c08848"/></dir></dir></dir></dir></dir></dir><dir name="docs"><file name="AuctionMaid MatrixRate Shipping Module.pdf" hash="5046ebd65b62a3b66556d8efc8a9976a"/><file name="manual install.sql" hash="b1bf0f9b9597d64777a3704f8064b011"/></dir><dir name="example"><dir name="7-col"><file name="export_all_products.csv" hash="ee76a59cc041f80012dc547febaf5393"/><file name="tablerates - item tofrom.csv" hash="c21b4cbf21aefa5cc590ccd2ff073a04"/><file name="tablerates - price tofrom.csv" hash="834af0aeb1aa98abf91f637015f5e3ba"/><file name="tablerates - weight tofrom.csv" hash="c2d26d1097c6a6b1641353b548437421"/></dir><dir name="9-col"><file name="AusRanges.csv" hash="7884e9c2a15f495ce6a80091c38478b5"/><file name="weight postcode range.csv" hash="8b0f12598742f57a5444bfee16219603"/><file name="weight postcode starts with.csv" hash="b83d1c8f6798a42186a63116fc5575b3"/></dir></dir><dir name="Freeoptionalshipping"><dir name="etc"><file name="config.xml" hash="f450793ee1f015b5ea0d84ec910c3d76"/><file name="system.xml" hash="7f1fb48e01e1299bf449a769084bddbc"/></dir><dir name="Model"><dir name="Carrier"><file name="Freeoptionalshipping.php" hash="3faf036413d22a0dfc9edc7e12df7c1f"/></dir></dir></dir><dir name="Matrixrate"><dir name="etc"><file name="config.xml" hash="2fa5eb007a21cd14c06a51afe267a376"/><file name="system.xml" hash="cf1c8c2b472453da081c12cba74ef4d1"/></dir><dir name="Model"><dir name="Carrier"><file name="Matrixrate.php" hash="f9082eb5c4c08d818bf4d88ddaebcb3a"/></dir><dir name="Mysql4"><dir name="Carrier"><file name="Matrixrate.php" hash="cf75257f31b72095b2cdd12347bbdbbd"/><dir name="Matrixrate"><file name="Collection.php" hash="adf9282dce1467f2d47e68b4ecc49de9"/></dir></dir></dir></dir><dir name="sql"><dir name="matrixrate_setup"><file name="mysql4-install-1.0.5.php" hash="32ea533fd01276e78322ae734446dc93"/><file name="mysql4-install-2.0.0.php" hash="32ea533fd01276e78322ae734446dc93"/><file name="mysql4-install-2.0.1.php" hash="505940c2071753011f03a92a18fe6141"/><file name="mysql4-uninstall-2.0.0.php" hash="7efdd041b23194f1fbb9b0afc657bf1e"/><file name="mysql4-uninstall-2.0.1.php" hash="7efdd041b23194f1fbb9b0afc657bf1e"/><file name="mysql4-upgrade-2.0.0.php" hash="32ea533fd01276e78322ae734446dc93"/><file name="mysql4-upgrade-2.0.1.php" hash="505940c2071753011f03a92a18fe6141"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Auctionmaid_Freeoptionalshipping.xml" hash="a8bceecaca2402682f1713222ce23b4d"/><file name="Auctionmaid_Matrixrate.xml" hash="bde75a0463f7dc40affc8b2ce812ec91"/></dir></target></contents>
26
  <compatible/>
27
  <dependencies/>
28
  </package>