Auctionmaid_Matrxrate - Version 3.0.3

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 3.0.3
Comparing to
See all releases


Code changes from version 3.0.2 to 3.0.3

Files changed (8) hide show
  1. app/code/community/Auctionmaid/Matrixrate/Model/Carrier/Matrixrate.php +2 -2
  2. app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php +8 -2
  3. app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate/Collection.php +0 -1
  4. app/code/community/Auctionmaid/Matrixrate/etc/config.xml +1 -0
  5. app/code/community/Auctionmaid/Matrixrate/etc/system.xml +10 -1
  6. app/code/community/Auctionmaid/example/7-col/weight postcode starts with.csv +12 -0
  7. app/code/community/Auctionmaid/license.txt +1 -0
  8. package.xml +4 -4
app/code/community/Auctionmaid/Matrixrate/Model/Carrier/Matrixrate.php CHANGED
@@ -69,8 +69,8 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
69
  $found=true;
70
  }
71
  }
72
- if ($found) {
73
- // this fixes bug in Magento where package value is not set correctly.
74
  $request->setPackageValue($total);
75
  }
76
  $this->setFreeBoxes($freeBoxes);
69
  $found=true;
70
  }
71
  }
72
+ if ($found && $this->getConfigFlag('remove_virtual')) {
73
+ // this fixes bug in Magento where package value is not set correctly, but at expense of sacrificing discounts
74
  $request->setPackageValue($total);
75
  }
76
  $this->setFreeBoxes($freeBoxes);
app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php CHANGED
@@ -49,7 +49,7 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_M
49
  $zipSearchString = $read->quoteInto(" AND ? LIKE dest_zip )", $postcode);
50
  }
51
 
52
- for ($j=0;$j<9;$j++)
53
  {
54
 
55
  $select = $read->select()->from($table);
@@ -109,8 +109,14 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_M
109
  $read->quoteInto(" (dest_country_id=? AND dest_region_id='0' AND dest_city='' AND dest_zip='') ", $request->getDestCountryId())
110
  );
111
  break;
112
-
113
  case 8:
 
 
 
 
 
 
 
114
  $select->where(
115
  " (dest_country_id='0' AND dest_region_id='0' AND dest_zip='')"
116
  );
49
  $zipSearchString = $read->quoteInto(" AND ? LIKE dest_zip )", $postcode);
50
  }
51
 
52
+ for ($j=0;$j<10;$j++)
53
  {
54
 
55
  $select = $read->select()->from($table);
109
  $read->quoteInto(" (dest_country_id=? AND dest_region_id='0' AND dest_city='' AND dest_zip='') ", $request->getDestCountryId())
110
  );
111
  break;
 
112
  case 8:
113
+ $select->where(
114
+ " (dest_country_id='0' AND dest_region_id='0'".
115
+ $zipSearchString
116
+ );
117
+ break;
118
+
119
+ case 9:
120
  $select->where(
121
  " (dest_country_id='0' AND dest_region_id='0' AND dest_zip='')"
122
  );
app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate/Collection.php CHANGED
@@ -34,7 +34,6 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate_Collection extends
34
 
35
  public function __construct()
36
  {
37
- throw new Exception('where');
38
  parent::__construct(Mage::getSingleton('core/resource')->getConnection('shipping_read'));
39
  $this->_shipTable = Mage::getSingleton('core/resource')->getTableName('matrixrate_shipping/matrixrate');
40
  $this->_countryTable = Mage::getSingleton('core/resource')->getTableName('directory/country');
34
 
35
  public function __construct()
36
  {
 
37
  parent::__construct(Mage::getSingleton('core/resource')->getConnection('shipping_read'));
38
  $this->_shipTable = Mage::getSingleton('core/resource')->getTableName('matrixrate_shipping/matrixrate');
39
  $this->_countryTable = Mage::getSingleton('core/resource')->getTableName('directory/country');
app/code/community/Auctionmaid/Matrixrate/etc/config.xml CHANGED
@@ -99,6 +99,7 @@
99
  <carriers>
100
  <matrixrate>
101
  <active>0</active>
 
102
  <sallowspecific>0</sallowspecific>
103
  <allow_free_shipping_promotions>1</allow_free_shipping_promotions>
104
  <show_only_free>0</show_only_free>
99
  <carriers>
100
  <matrixrate>
101
  <active>0</active>
102
+ <remove_virtual>0</remove_virtual>
103
  <sallowspecific>0</sallowspecific>
104
  <allow_free_shipping_promotions>1</allow_free_shipping_promotions>
105
  <show_only_free>0</show_only_free>
app/code/community/Auctionmaid/Matrixrate/etc/system.xml CHANGED
@@ -35,7 +35,7 @@
35
  <sort_order>320</sort_order>
36
  <show_in_default>1</show_in_default>
37
  <show_in_website>1</show_in_website>
38
- <show_in_store>0</show_in_store>
39
  <groups>
40
  <matrixrate translate="label">
41
  <label>Auctionmaid Matrix Rates</label>
@@ -123,6 +123,15 @@
123
  <show_in_website>1</show_in_website>
124
  <show_in_store>1</show_in_store>
125
  </zip_range>
 
 
 
 
 
 
 
 
 
126
  <condition_name translate="label">
127
  <label>Condition</label>
128
  <frontend_type>select</frontend_type>
35
  <sort_order>320</sort_order>
36
  <show_in_default>1</show_in_default>
37
  <show_in_website>1</show_in_website>
38
+ <show_in_store>1</show_in_store>
39
  <groups>
40
  <matrixrate translate="label">
41
  <label>Auctionmaid Matrix Rates</label>
123
  <show_in_website>1</show_in_website>
124
  <show_in_store>1</show_in_store>
125
  </zip_range>
126
+ <remove_virtual translate="label">
127
+ <label>Exclude Virtual from Cart Price</label>
128
+ <frontend_type>select</frontend_type>
129
+ <source_model>adminhtml/system_config_source_yesno</source_model>
130
+ <sort_order>70</sort_order>
131
+ <show_in_default>1</show_in_default>
132
+ <show_in_website>1</show_in_website>
133
+ <show_in_store>1</show_in_store>
134
+ </remove_virtual>
135
  <condition_name translate="label">
136
  <label>Condition</label>
137
  <frontend_type>select</frontend_type>
app/code/community/Auctionmaid/example/7-col/weight postcode starts with.csv ADDED
@@ -0,0 +1,12 @@
 
 
 
 
 
 
 
 
 
 
 
 
1
+ Country,Region/State,Zip/Postal Code,Weight from,Weight to,Shipping Price,Delivery Type
2
+ GBR,*,*,0,5,2.99,1st Class Recorded
3
+ GBR,*,*,0,32,7.99,ParcelForce 24-48
4
+ GBR,*,*,32,1000,80,Special Pallet Delivery
5
+ GBR,*,*,2000,2100,0,Collection Only
6
+ GBR,*,N,0,5,1.99,By Foot
7
+ GBR,*,BT,0,5,11.99,1st Class Recorded
8
+ GBR,*,BT1,0,32,14.99,ParcelForce 24-48
9
+ GBR,*,BT2,0,1000,200,Special Pallet Delivery
10
+ IRL,*,*,0,5,17.99,1st Class Recorded
11
+ IRL,*,*,0,32,17.99,ParcelForce 24-48
12
+ *,*,*,0,10,50,Worldwide
app/code/community/Auctionmaid/license.txt ADDED
@@ -0,0 +1 @@
 
1
+ http://www.opensource.org/licenses/osl-3.0.php
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctionmaid_Matrxrate</name>
4
- <version>3.0.2</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>
@@ -18,9 +18,9 @@ Suitable for all countries incl UK, US, AUS, Europe.</summary>
18
  - numerical postcode ranges</description>
19
  <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>
20
  <authors><author><name>Karen Baker</name><user>auto-converted</user><email>enquiries@auctionmaid.com</email></author></authors>
21
- <date>2009-07-07</date>
22
- <time>20:03:03</time>
23
- <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="9691423778faa862521269ae868f3ef6"/><file name="manual install.sql" hash="838db93c057c71ed75b3b472d2d71c1e"/></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="Matrixrate"><dir name="etc"><file name="config.xml" hash="ea00d05cc814108ca3971fae64ad3327"/><file name="system.xml" hash="965943c74e2e453a2b301e06e645b461"/></dir><dir name="Model"><dir name="Carrier"><file name="Matrixrate.php" hash="8b92d1cd011bc3fd90df2f180b468c5b"/></dir><dir name="Mysql4"><dir name="Carrier"><file name="Matrixrate.php" hash="439f18391bd6c378adcce959dd23d388"/><dir name="Matrixrate"><file name="Collection.php" hash="adf9282dce1467f2d47e68b4ecc49de9"/></dir></dir></dir></dir><dir name="sql"><dir name="matrixrate_setup"><file name="mysql4-install-2.0.1.php" hash="52a413f99ce3d571a067cdfb677bbf32"/><file name="mysql4-uninstall-2.0.1.php" hash="d6c1d1d151f31a9d4f78e437d1d73e38"/><file name="mysql4-upgrade-2.0.1.php" hash="b880269c8cc28028c4ed0157b4f74d54"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Auctionmaid_Matrixrate.xml" hash="bde75a0463f7dc40affc8b2ce812ec91"/></dir></target></contents>
24
  <compatible/>
25
  <dependencies/>
26
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctionmaid_Matrxrate</name>
4
+ <version>3.0.3</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>
18
  - numerical postcode ranges</description>
19
  <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>
20
  <authors><author><name>Karen Baker</name><user>auto-converted</user><email>enquiries@auctionmaid.com</email></author></authors>
21
+ <date>2009-09-17</date>
22
+ <time>16:40:42</time>
23
+ <contents><target name="magecommunity"><dir name="Auctionmaid"><file name="license.txt" hash="b7870fbc716085862b4cba9b4629a24e"/><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="9691423778faa862521269ae868f3ef6"/><file name="manual install.sql" hash="838db93c057c71ed75b3b472d2d71c1e"/></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"/><file name="weight postcode starts with.csv" hash="b83d1c8f6798a42186a63116fc5575b3"/></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="Matrixrate"><dir name="etc"><file name="config.xml" hash="ac562da37b337d17d2f2fb54a7eef18a"/><file name="system.xml" hash="44852c21719863decc98311c7b662034"/></dir><dir name="Model"><dir name="Carrier"><file name="Matrixrate.php" hash="935f5c120ed740ce3badb07b69500337"/></dir><dir name="Mysql4"><dir name="Carrier"><file name="Matrixrate.php" hash="440bee2737cf7ba7d85df66e3efe0641"/><dir name="Matrixrate"><file name="Collection.php" hash="e9833f77c95c5b00e2e0abc37195e382"/></dir></dir></dir></dir><dir name="sql"><dir name="matrixrate_setup"><file name="mysql4-install-2.0.1.php" hash="52a413f99ce3d571a067cdfb677bbf32"/><file name="mysql4-uninstall-2.0.1.php" hash="d6c1d1d151f31a9d4f78e437d1d73e38"/><file name="mysql4-upgrade-2.0.1.php" hash="b880269c8cc28028c4ed0157b4f74d54"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Auctionmaid_Matrixrate.xml" hash="bde75a0463f7dc40affc8b2ce812ec91"/></dir></target></contents>
24
  <compatible/>
25
  <dependencies/>
26
  </package>