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.2 |
Comparing to | |
See all releases |
Code changes from version 3.0.1 to 3.0.2
app/code/community/Auctionmaid/Matrixrate/Model/Carrier/Matrixrate.php
CHANGED
@@ -60,12 +60,12 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
|
|
60 |
$found=false;
|
61 |
$total=0;
|
62 |
foreach ($request->getAllItems() as $item) {
|
63 |
-
if ($item->getFreeShipping() &&
|
64 |
$freeBoxes+=$item->getQty();
|
65 |
}
|
66 |
if ($item->getProductType() != Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL ||
|
67 |
$item->getProductType() != 'downloadable') {
|
68 |
-
$total
|
69 |
$found=true;
|
70 |
}
|
71 |
}
|
60 |
$found=false;
|
61 |
$total=0;
|
62 |
foreach ($request->getAllItems() as $item) {
|
63 |
+
if ($item->getFreeShipping() && $item->getProductType()!= Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL ) {
|
64 |
$freeBoxes+=$item->getQty();
|
65 |
}
|
66 |
if ($item->getProductType() != Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL ||
|
67 |
$item->getProductType() != 'downloadable') {
|
68 |
+
$total+= $item->getBaseRowTotal();
|
69 |
$found=true;
|
70 |
}
|
71 |
}
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Auctionmaid_Matrxrate</name>
|
4 |
-
<version>3.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>
|
@@ -15,14 +15,12 @@ Suitable for all countries incl UK, US, AUS, Europe.</summary>
|
|
15 |
- filter on #items, weight, or price vs destination
|
16 |
- country, region, city, postcode filtering
|
17 |
- partial postcode filtering, including pattern matching
|
18 |
-
- numerical postcode ranges
|
19 |
-
- collection only option
|
20 |
-
- free shipping threshold</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="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="
|
26 |
<compatible/>
|
27 |
<dependencies/>
|
28 |
</package>
|
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>
|
15 |
- filter on #items, weight, or price vs destination
|
16 |
- country, region, city, postcode filtering
|
17 |
- partial postcode filtering, including pattern matching
|
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>
|