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.9 |
Comparing to | |
See all releases |
Code changes from version 2.0.8 to 2.0.9
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<
|
53 |
{
|
54 |
|
55 |
$select = $read->select()->from($table);
|
@@ -77,34 +77,40 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_M
|
|
77 |
$read->quoteInto(" AND STRCMP(LOWER(dest_city),LOWER(?)) = 0 AND dest_zip='')", $request->getDestCity())
|
78 |
);
|
79 |
break;
|
80 |
-
|
81 |
case 3:
|
82 |
$select->where(
|
83 |
$read->quoteInto(" (dest_country_id=? ", $request->getDestCountryId()).
|
84 |
-
$read->quoteInto(" AND STRCMP(LOWER(dest_city),LOWER(?)) = 0 AND dest_region_id='0'
|
|
|
85 |
);
|
86 |
break;
|
87 |
case 4:
|
|
|
|
|
|
|
|
|
|
|
|
|
88 |
$select->where(
|
89 |
$read->quoteInto(" (dest_country_id=? AND dest_region_id='0' AND dest_city='' ", $request->getDestCountryId()).
|
90 |
# $read->quoteInto(" AND ? LIKE dest_zip ) ", $postcode)
|
91 |
$zipSearchString
|
92 |
);
|
93 |
break;
|
94 |
-
case
|
95 |
$select->where(
|
96 |
$read->quoteInto(" (dest_country_id=? ", $request->getDestCountryId()).
|
97 |
$read->quoteInto(" AND dest_region_id=? AND dest_city='' AND dest_zip='') ", $request->getDestRegionId())
|
98 |
);
|
99 |
break;
|
100 |
|
101 |
-
case
|
102 |
$select->where(
|
103 |
$read->quoteInto(" (dest_country_id=? AND dest_region_id='0' AND dest_city='' AND dest_zip='') ", $request->getDestCountryId())
|
104 |
);
|
105 |
break;
|
106 |
|
107 |
-
case
|
108 |
$select->where(
|
109 |
" (dest_country_id='0' AND dest_region_id='0' AND dest_zip='')"
|
110 |
);
|
@@ -137,7 +143,6 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_M
|
|
137 |
$select->order('dest_region_id DESC');
|
138 |
$select->order('dest_zip DESC');
|
139 |
$select->order('condition_from_value DESC');
|
140 |
-
|
141 |
/*
|
142 |
pdo has an issue. we cannot use bind
|
143 |
*/
|
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);
|
77 |
$read->quoteInto(" AND STRCMP(LOWER(dest_city),LOWER(?)) = 0 AND dest_zip='')", $request->getDestCity())
|
78 |
);
|
79 |
break;
|
|
|
80 |
case 3:
|
81 |
$select->where(
|
82 |
$read->quoteInto(" (dest_country_id=? ", $request->getDestCountryId()).
|
83 |
+
$read->quoteInto(" AND STRCMP(LOWER(dest_city),LOWER(?)) = 0 AND dest_region_id='0'", $request->getDestCity()).
|
84 |
+
$zipSearchString
|
85 |
);
|
86 |
break;
|
87 |
case 4:
|
88 |
+
$select->where(
|
89 |
+
$read->quoteInto(" (dest_country_id=? ", $request->getDestCountryId()).
|
90 |
+
$read->quoteInto(" AND STRCMP(LOWER(dest_city),LOWER(?)) = 0 AND dest_region_id='0' AND dest_zip='') ", $request->getDestCity())
|
91 |
+
);
|
92 |
+
break;
|
93 |
+
case 5:
|
94 |
$select->where(
|
95 |
$read->quoteInto(" (dest_country_id=? AND dest_region_id='0' AND dest_city='' ", $request->getDestCountryId()).
|
96 |
# $read->quoteInto(" AND ? LIKE dest_zip ) ", $postcode)
|
97 |
$zipSearchString
|
98 |
);
|
99 |
break;
|
100 |
+
case 6:
|
101 |
$select->where(
|
102 |
$read->quoteInto(" (dest_country_id=? ", $request->getDestCountryId()).
|
103 |
$read->quoteInto(" AND dest_region_id=? AND dest_city='' AND dest_zip='') ", $request->getDestRegionId())
|
104 |
);
|
105 |
break;
|
106 |
|
107 |
+
case 7:
|
108 |
$select->where(
|
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 |
);
|
143 |
$select->order('dest_region_id DESC');
|
144 |
$select->order('dest_zip DESC');
|
145 |
$select->order('condition_from_value DESC');
|
|
|
146 |
/*
|
147 |
pdo has an issue. we cannot use bind
|
148 |
*/
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Auctionmaid_Matrxrate</name>
|
4 |
-
<version>2.0.
|
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-
|
24 |
-
<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="
|
26 |
<compatible/>
|
27 |
<dependencies/>
|
28 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Auctionmaid_Matrxrate</name>
|
4 |
+
<version>2.0.9</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-05-13</date>
|
24 |
+
<time>22:31:50</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="2aa137bddf757b7dddf96bbbf8d4019a"/></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="61a1a724230fab3a9a9fe68ab9ee29cd"/></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="24898ce416ea6c273694e9ec70a32cd3"/><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="b73c3fbb8af9c75af23beddfd9b8888a"/><file name="mysql4-uninstall-2.0.0.php" hash="7efdd041b23194f1fbb9b0afc657bf1e"/><file name="mysql4-uninstall-2.0.1.php" hash="d6c1d1d151f31a9d4f78e437d1d73e38"/><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>
|