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.0 |
Comparing to | |
See all releases |
Code changes from version 3.0.6 to 3.0.0
- app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-uninstall-2.0.1.php +0 -13
- app/code/community/Auctionmaid/docs/Webshopapps MatrixRate Shipping Module.pdf +0 -0
- app/code/community/Auctionmaid/example/7-col/export_all_products.csv +0 -9
- app/code/community/Auctionmaid/example/7-col/tablerates - item tofrom.csv +0 -11
- app/code/community/Auctionmaid/example/7-col/tablerates - price tofrom.csv +0 -11
- app/code/community/Auctionmaid/example/7-col/tablerates - weight tofrom.csv +0 -11
- app/code/community/Auctionmaid/example/7-col/weight postcode starts with.csv +0 -12
- app/code/community/Auctionmaid/example/9-col/AusRanges.csv +0 -6
- app/code/community/Auctionmaid/example/9-col/item simple.csv +0 -6
- app/code/community/Auctionmaid/example/9-col/usa example.csv +0 -7
- app/code/community/Auctionmaid/example/9-col/weight postcode range.csv +0 -9
- app/code/community/Auctionmaid/example/9-col/weight postcode starts with.csv +0 -12
- app/code/community/Auctionmaid/license.txt +0 -1
- app/code/community/{Auctionmaid → Webshopapps/Matrixrate}/Adminhtml/Model/System/Config/Backend/Shipping/Matrixrate.php +7 -8
- app/code/community/{Auctionmaid → Webshopapps/Matrixrate}/Adminhtml/Model/System/Config/Source/Shipping/Matrixrate.php +7 -8
- app/code/community/Webshopapps/Matrixrate/Helper/Data.php +60 -0
- app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/Model/Carrier/Matrixrate.php +9 -8
- app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php +6 -6
- app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/Model/Mysql4/Carrier/Matrixrate/Collection.php +7 -7
- app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/etc/config.xml +51 -30
- app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/etc/system.xml +24 -30
- app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.1.php +0 -0
- app/code/community/{Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.1.php → Webshopapps/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.2.php} +2 -3
- app/code/community/{Auctionmaid/docs/manual install.sql → Webshopapps/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.1-2.0.2.php} +18 -3
- app/etc/modules/Auctionmaid_Matrixrate.xml +0 -37
- app/etc/modules/Webshopapps_Matrixrate.xml +12 -0
- package.xml +10 -11
app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-uninstall-2.0.1.php
DELETED
@@ -1,13 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
$installer = $this;
|
3 |
-
|
4 |
-
$installer->startSetup();
|
5 |
-
|
6 |
-
$installer->run("
|
7 |
-
DROP TABLE IF EXISTS {$this->getTable('shipping_matrixrate')};
|
8 |
-
DELETE FROM {$this->getTable('core/config_data')} WHERE path like 'carriers/freeoptionalshipping/%';
|
9 |
-
DELETE FROM {$this->getTable('core/config_data')} WHERE path like 'carriers/matrixrate/%';
|
10 |
-
DELETE FROM {$this->getTable('eav_attribute')} WHERE attribute_code = 'exclude_free_shipping';
|
11 |
-
");
|
12 |
-
|
13 |
-
$installer->endSetup();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/docs/Webshopapps MatrixRate Shipping Module.pdf
DELETED
Binary file
|
app/code/community/Auctionmaid/example/7-col/export_all_products.csv
DELETED
@@ -1,9 +0,0 @@
|
|
1 |
-
"store","websites","attribute_set","type","sku","category_ids","has_options","status","visibility","tax_class_id","exclude_free_shipping","weight","price","name","meta_title","meta_description","image","small_image","thumbnail","url_key","url_path","custom_design","options_container","gift_message_available","description","short_description","meta_keyword","custom_layout_update","qty","min_qty","use_config_min_qty","is_qty_decimal","backorders","use_config_backorders","min_sale_qty","use_config_min_sale_qty","max_sale_qty","use_config_max_sale_qty","is_in_stock","low_stock_date","notify_stock_qty","use_config_notify_stock_qty","manage_stock","use_config_manage_stock"
|
2 |
-
"admin","base","Default","simple","1","3","0","Enabled","Catalog, Search","Taxable Goods","0","1.0000","15.0000","lightweight product","","","","","","dummy-rabbit-hutch","dummy-rabbit-hutch.html","","Block after Info Column","Use config","light","dummy rabbit hutch","","","22.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","1","0000-00-00 00:00:00","","1","0","1"
|
3 |
-
"admin","base","Default","simple","free-courier","3","0","Enabled","Catalog, Search","Taxable Goods","0","25.0000","25.0000","not free & courier delivery product","","","","","","not-free-and-courier-delivery-product","not-free-and-courier-delivery-product.html","","Block after Info Column","Use config","free delivery product","free delivery product","","","100.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","1","0000-00-00 00:00:00","","1","0","0"
|
4 |
-
"admin","base","Default","simple","50","3","0","Enabled","Catalog, Search","Taxable Goods","0","25.0000","15.0000","pallet & not free","","","","","","heavy-and-not-free","heavy-and-not-free.html","","Block after Info Column","Use config","dummy rabbit hutch","dummy rabbit hutch","","","123.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","1","0000-00-00 00:00:00","","1","0","1"
|
5 |
-
"admin","base","Default","simple","PICKUP-1","3","0","Enabled","Catalog, Search","Taxable Goods","1","2010.0000","456.0000","Pickup Item & excluded free","","","","","","pickup-item","pickup-item.html","","Block after Info Column","Use config","Pickup Item","Pickup Item","","","0.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","0","2008-11-01 03:08:52","","1","0","0"
|
6 |
-
"admin","base","Default","simple","124","3","0","Enabled","Catalog, Search","Taxable Goods","0","1.0000","45.0000","light and free","","","","","","dummy-rabbit-hutch","dummy-rabbit-hutch-2.html","","Block after Info Column","Use config","light","dummy rabbit hutch","","","0.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","0","2008-11-01 03:04:11","","1","0","0"
|
7 |
-
"admin","base","Default","simple","4353453","3","0","Enabled","Catalog, Search","Taxable Goods","1","1.0000","45.0000","light and free but excluded from free","","","","","","light-and-free-but-excluded-from-free","light-and-free-but-excluded-from-free.html","","Block after Info Column","Use config","light","dummy rabbit hutch","","","0.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","0","2008-11-01 03:33:08","","1","0","0"
|
8 |
-
"admin","base","Default","simple","5745747","3","0","Enabled","Catalog, Search","Taxable Goods","1","240.0000","45.0000","free & pallet & excluded from free","","","","","","free-and-heavy-and-excluded-from-free","free-and-heavy-and-excluded-from-free.html","","Block after Info Column","Use config","free delivery product","free delivery product","","","0.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","0","2008-11-01 03:28:19","","1","0","0"
|
9 |
-
"admin","base","Default","simple","32342","3","0","Enabled","Catalog, Search","Taxable Goods","0","240.0000","45.0000","free & pallet","","","","","","free-and-heavy-and-excluded-from-free","free-and-heavy-and-excluded-from-free-1.html","","Block after Info Column","Use config","free delivery product","free delivery product","","","0.0000","0.0000","1","0","0","1","1.0000","1","0.0000","1","0","2008-11-01 03:29:25","","1","0","0"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/7-col/tablerates - item tofrom.csv
DELETED
@@ -1,11 +0,0 @@
|
|
1 |
-
"Country","Region/State","Zip/Postal Code","Item from", "Item to","Shipping Price","Delivery Type"
|
2 |
-
"GBR","*","*","0","1","2.99","1st Class Recorded"
|
3 |
-
"GBR","*","*","2","5","7.99","ParcelForce 24-48"
|
4 |
-
"GBR","*","*","5","1000","80.00","Special Pallet Delivery"
|
5 |
-
"GBR","*","*","2000","2100","0","Collection Only"
|
6 |
-
"GBR","*","BT","0","2","11.99","1st Class Recorded"
|
7 |
-
"GBR","*","BT","0","32","14.99","ParcelForce 24-48"
|
8 |
-
"GBR","*","BT","0","1000","200","Special Pallet Delivery"
|
9 |
-
"IRL","*","*","0","5","17.99","1st Class Recorded"
|
10 |
-
"IRL","*","*","0","32","17.99","ParcelForce 24-48"
|
11 |
-
"*","*","*","0","10","50","Worldwide"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/7-col/tablerates - price tofrom.csv
DELETED
@@ -1,11 +0,0 @@
|
|
1 |
-
"Country","Region/State","Zip/Postal Code","Price from", "Price 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.00","Special Pallet Delivery"
|
5 |
-
"GBR","*","*","2000","2100","0","Collection Only"
|
6 |
-
"GBR","*","BT","0","5","11.99","1st Class Recorded"
|
7 |
-
"GBR","*","BT","0","32","14.99","ParcelForce 24-48"
|
8 |
-
"GBR","*","BT","0","1000","200","Special Pallet Delivery"
|
9 |
-
"IRL","*","*","0","5","17.99","1st Class Recorded"
|
10 |
-
"IRL","*","*","0","32","17.99","ParcelForce 24-48"
|
11 |
-
"*","*","*","0","10","50","Worldwide"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/7-col/tablerates - weight tofrom.csv
DELETED
@@ -1,11 +0,0 @@
|
|
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.00","Special Pallet Delivery"
|
5 |
-
"GBR","*","*","2000","2100","0","Collection Only"
|
6 |
-
"GBR","*","BT","0","5","11.99","1st Class Recorded"
|
7 |
-
"GBR","*","BT","0","32","14.99","ParcelForce 24-48"
|
8 |
-
"GBR","*","BT","0","1000","200","Special Pallet Delivery"
|
9 |
-
"IRL","*","*","0","5","17.99","1st Class Recorded"
|
10 |
-
"IRL","*","*","0","32","17.99","ParcelForce 24-48"
|
11 |
-
"*","*","*","0","10","50","Worldwide"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/7-col/weight postcode starts with.csv
DELETED
@@ -1,12 +0,0 @@
|
|
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/example/9-col/AusRanges.csv
DELETED
@@ -1,6 +0,0 @@
|
|
1 |
-
Country,Region/State,City,Zip/Postal Code,Zip to,Weight from,Weight to,Shipping Price,Delivery Type
|
2 |
-
AUS,*,*,*,*,0,20,15,Main Post
|
3 |
-
AUS,*,*,9766,9856,0,20,15,Main Post
|
4 |
-
AUS,*,*,9766,9856,0,20,9.50,Aus Courier1
|
5 |
-
AUS,*,*,9857,9899,0,20,12.50,Aus Courier2
|
6 |
-
*,*,*,*,*,0,10,50,Worldwide
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/9-col/item simple.csv
DELETED
@@ -1,6 +0,0 @@
|
|
1 |
-
"Country","Region/State","City","Zip/Postal Code","Zip to","Item >=","Item <=","Shipping Price","Delivery Type"
|
2 |
-
"GBR","*","*","*","*",0,1,3,"Standard"
|
3 |
-
"GBR","*","*","*","*",2,2,4,"Standard"
|
4 |
-
"GBR","*","*","*","*",3,3,5,"Standard"
|
5 |
-
"GBR","*","*","*","*",4,4,6,"Standard"
|
6 |
-
"GBR","*","*","*","*",5,100000,7,"Standard"
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/9-col/usa example.csv
DELETED
@@ -1,7 +0,0 @@
|
|
1 |
-
"Country","Region/State","Zip/Postal Code","Price >=","Price To<=","Shipping Price","Delivery Type"
|
2 |
-
"USA","*","*",0,24.99,6.95,"Standard"
|
3 |
-
"USA","*","*",25,49.99,7.95,"Standard"
|
4 |
-
"USA","*","*",50,74.99,8.95,"Standard"
|
5 |
-
"USA","*","*",75,99.99,9.95,"Standard"
|
6 |
-
"USA","*","*",100,1000000,0,"Standard"
|
7 |
-
"USA","*","*",0,1000000,0,"Expedited"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/9-col/weight postcode range.csv
DELETED
@@ -1,9 +0,0 @@
|
|
1 |
-
Country,Region/State,City,Zip/Postal Code,Zip to,Weight from,Weight to,Shipping Price,Delivery Type
|
2 |
-
GBR,*,LONDON,2000,3000,0,5,4.99,AllRate
|
3 |
-
GBR,*,LONDON,2000,3000,7,20,4.99,Big All Rate
|
4 |
-
GBR,*,LONDON,2000,3000,0,5,6.99,1st Class Recorded
|
5 |
-
GBR,*,LONDON,*,*,0,5,2.99,1st Class Recorded
|
6 |
-
GBR,*,*,*,*,0,5,2.99,GBR Rate inclusive
|
7 |
-
GBR,*,*,2551,3200,0,5,12.99,GBR Postcode Range only
|
8 |
-
GBR,*,BIRMINGHAM,*,*,0,32,7.99,ParcelForce 24-48
|
9 |
-
*,*,*,*,*,0,10,50,Worldwide
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/example/9-col/weight postcode starts with.csv
DELETED
@@ -1,12 +0,0 @@
|
|
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
DELETED
@@ -1 +0,0 @@
|
|
1 |
-
http://www.opensource.org/licenses/osl-3.0.php
|
|
app/code/community/{Auctionmaid → Webshopapps/Matrixrate}/Adminhtml/Model/System/Config/Backend/Shipping/Matrixrate.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
@@ -18,18 +18,17 @@
|
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
-
*
|
22 |
*
|
23 |
-
* @category
|
24 |
-
* @package
|
25 |
-
* @copyright Copyright (c)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
-
* @author Karen Baker <
|
28 |
*/
|
29 |
|
30 |
|
31 |
-
|
32 |
-
class Auctionmaid_Adminhtml_Model_System_Config_Backend_Shipping_Matrixrate extends Mage_Core_Model_Config_Data
|
33 |
{
|
34 |
public function _afterSave()
|
35 |
{
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Webshopapps Shipping Module
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
+
* Shipping MatrixRates
|
22 |
*
|
23 |
+
* @category Webshopapps
|
24 |
+
* @package Webshopapps_Matrixrate
|
25 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
+
* @author Karen Baker <sales@webshopapps.com>
|
28 |
*/
|
29 |
|
30 |
|
31 |
+
class Webshopapps_Matrixrate_Adminhtml_Model_System_Config_Backend_Shipping_Matrixrate extends Mage_Core_Model_Config_Data
|
|
|
32 |
{
|
33 |
public function _afterSave()
|
34 |
{
|
app/code/community/{Auctionmaid → Webshopapps/Matrixrate}/Adminhtml/Model/System/Config/Source/Shipping/Matrixrate.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
@@ -18,17 +18,16 @@
|
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
-
*
|
22 |
*
|
23 |
-
* @category
|
24 |
-
* @package
|
25 |
-
* @copyright Copyright (c)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
-
* @author Karen Baker <
|
28 |
*/
|
29 |
|
30 |
-
|
31 |
-
class Auctionmaid_Adminhtml_Model_System_Config_Source_Shipping_Matrixrate
|
32 |
{
|
33 |
public function toOptionArray()
|
34 |
{
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Webshopapps Shipping Module
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
+
* Shipping MatrixRates
|
22 |
*
|
23 |
+
* @category Webshopapps
|
24 |
+
* @package Webshopapps_Matrixrate
|
25 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
+
* @author Karen Baker <sales@webshopapps.com>
|
28 |
*/
|
29 |
|
30 |
+
class Webshopapps_Matrixrate_Adminhtml_Model_System_Config_Source_Shipping_Matrixrate
|
|
|
31 |
{
|
32 |
public function toOptionArray()
|
33 |
{
|
app/code/community/Webshopapps/Matrixrate/Helper/Data.php
ADDED
@@ -0,0 +1,60 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
+
*
|
21 |
+
* @category Mage
|
22 |
+
* @package Mage_Shipping
|
23 |
+
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
/**
|
27 |
+
* Webshopapps Shipping Module
|
28 |
+
*
|
29 |
+
* NOTICE OF LICENSE
|
30 |
+
*
|
31 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
32 |
+
* that is bundled with this package in the file LICENSE.txt.
|
33 |
+
* It is also available through the world-wide-web at this URL:
|
34 |
+
* http://opensource.org/licenses/osl-3.0.php
|
35 |
+
* If you did not receive a copy of the license and are unable to
|
36 |
+
* obtain it through the world-wide-web, please send an email
|
37 |
+
* to license@magentocommerce.com so we can send you a copy immediately.
|
38 |
+
*
|
39 |
+
* DISCLAIMER
|
40 |
+
*
|
41 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
42 |
+
* versions in the future. If you wish to customize Magento for your
|
43 |
+
* needs please refer to http://www.magentocommerce.com for more information.
|
44 |
+
*
|
45 |
+
* Shipping MatrixRates
|
46 |
+
*
|
47 |
+
* @category Webshopapps
|
48 |
+
* @package Webshopapps_Matrixrate
|
49 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
50 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
51 |
+
* @author Karen Baker <sales@webshopapps.com>
|
52 |
+
*/
|
53 |
+
|
54 |
+
/**
|
55 |
+
* Shipping data helper
|
56 |
+
*/
|
57 |
+
class Webshopapps_Matrixrate_Helper_Data extends Mage_Core_Helper_Abstract
|
58 |
+
{
|
59 |
+
|
60 |
+
}
|
app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/Model/Carrier/Matrixrate.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
@@ -18,15 +18,16 @@
|
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
-
*
|
22 |
-
*
|
23 |
-
* @
|
|
|
|
|
24 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
-
* @author Karen Baker <
|
26 |
*/
|
27 |
|
28 |
-
|
29 |
-
class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
|
30 |
extends Mage_Shipping_Model_Carrier_Abstract
|
31 |
implements Mage_Shipping_Model_Carrier_Interface
|
32 |
{
|
@@ -119,7 +120,7 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
|
|
119 |
|
120 |
$method->setMethod('matrixrate_'.$rate['pk']);
|
121 |
|
122 |
-
$method->setMethodTitle($rate['delivery_type']);
|
123 |
|
124 |
$shippingPrice = $this->getFinalPriceWithHandlingFee($rate['price']);
|
125 |
$method->setCost($rate['cost']);
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Webshopapps Shipping Module
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
+
* Shipping MatrixRates
|
22 |
+
*
|
23 |
+
* @category Webshopapps
|
24 |
+
* @package Webshopapps_Matrixrate
|
25 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
+
* @author Karen Baker <sales@webshopapps.com>
|
28 |
*/
|
29 |
|
30 |
+
class Webshopapps_Matrixrate_Model_Carrier_Matrixrate
|
|
|
31 |
extends Mage_Shipping_Model_Carrier_Abstract
|
32 |
implements Mage_Shipping_Model_Carrier_Interface
|
33 |
{
|
120 |
|
121 |
$method->setMethod('matrixrate_'.$rate['pk']);
|
122 |
|
123 |
+
$method->setMethodTitle(Mage::helper('matrixrate')->__($rate['delivery_type']));
|
124 |
|
125 |
$shippingPrice = $this->getFinalPriceWithHandlingFee($rate['price']);
|
126 |
$method->setCost($rate['cost']);
|
app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
@@ -20,13 +20,13 @@
|
|
20 |
*
|
21 |
* Shipping MatrixRates
|
22 |
*
|
23 |
-
* @category
|
24 |
-
* @package
|
25 |
-
* @copyright Copyright (c)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
-
* @author Karen Baker <
|
28 |
*/
|
29 |
-
class
|
30 |
{
|
31 |
protected function _construct()
|
32 |
{
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Webshopapps Shipping Module
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
20 |
*
|
21 |
* Shipping MatrixRates
|
22 |
*
|
23 |
+
* @category Webshopapps
|
24 |
+
* @package Webshopapps_Matrixrate
|
25 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
+
* @author Karen Baker <sales@webshopapps.com>
|
28 |
*/
|
29 |
+
class Webshopapps_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_Model_Mysql4_Abstract
|
30 |
{
|
31 |
protected function _construct()
|
32 |
{
|
app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/Model/Mysql4/Carrier/Matrixrate/Collection.php
RENAMED
@@ -1,6 +1,6 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
*
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
@@ -18,15 +18,15 @@
|
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
-
* Shipping MatrixRates
|
22 |
*
|
23 |
-
* @category
|
24 |
-
* @package
|
25 |
-
* @copyright Copyright (c)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
-
* @author Karen Baker <
|
28 |
*/
|
29 |
-
class
|
30 |
{
|
31 |
protected $_shipTable;
|
32 |
protected $_countryTable;
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Webshopapps Shipping Module
|
4 |
*
|
5 |
* NOTICE OF LICENSE
|
6 |
*
|
18 |
* versions in the future. If you wish to customize Magento for your
|
19 |
* needs please refer to http://www.magentocommerce.com for more information.
|
20 |
*
|
21 |
+
* Shipping MatrixRates
|
22 |
*
|
23 |
+
* @category Webshopapps
|
24 |
+
* @package Webshopapps_Matrixrate
|
25 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
26 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
27 |
+
* @author Karen Baker <sales@webshopapps.com>
|
28 |
*/
|
29 |
+
class Webshopapps_Matrixrate_Model_Mysql4_Carrier_Matrixrate_Collection extends Varien_Data_Collection_Db
|
30 |
{
|
31 |
protected $_shipTable;
|
32 |
protected $_countryTable;
|
app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/etc/config.xml
RENAMED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<!--
|
3 |
/**
|
4 |
-
*
|
5 |
*
|
6 |
* NOTICE OF LICENSE
|
7 |
*
|
@@ -19,38 +19,36 @@
|
|
19 |
* versions in the future. If you wish to customize Magento for your
|
20 |
* needs please refer to http://www.magentocommerce.com for more information.
|
21 |
*
|
22 |
-
*
|
23 |
-
*
|
24 |
-
* @
|
|
|
|
|
25 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
26 |
-
* @author Karen Baker <
|
27 |
*/
|
|
|
28 |
-->
|
29 |
<config>
|
30 |
<modules>
|
31 |
-
|
32 |
-
|
33 |
-
|
34 |
-
<version>2.0.1</version>
|
35 |
-
<depends>
|
36 |
-
<Mage_Shipping />
|
37 |
-
</depends>
|
38 |
-
</Auctionmaid_Matrixrate>
|
39 |
</modules>
|
40 |
<global>
|
41 |
-
<!-- declare model group for new module -->
|
42 |
<models>
|
43 |
-
|
44 |
-
|
45 |
-
|
46 |
-
|
47 |
-
|
|
|
48 |
<matrixrate_shipping>
|
49 |
-
<class>
|
50 |
<resourceModel>matrixrate_mysql4</resourceModel>
|
51 |
</matrixrate_shipping>
|
52 |
<matrixrate_mysql4>
|
53 |
-
<class>
|
54 |
<entities>
|
55 |
<matrixrate>
|
56 |
<table>shipping_matrixrate</table>
|
@@ -58,19 +56,12 @@
|
|
58 |
</entities>
|
59 |
</matrixrate_mysql4>
|
60 |
</models>
|
61 |
-
|
62 |
-
<!-- declare resource setup for new module -->
|
63 |
<resources>
|
64 |
-
<!-- resource identifier -->
|
65 |
<matrixrate_setup>
|
66 |
-
<!-- specify that this resource is a setup resource and used for upgrades -->
|
67 |
<setup>
|
68 |
-
|
69 |
-
<module>Auctionmaid_Matrixrate</module>
|
70 |
</setup>
|
71 |
-
<!-- specify database connection for this resource -->
|
72 |
<connection>
|
73 |
-
<!-- do not create new connection, use predefined core setup connection -->
|
74 |
<use>core_setup</use>
|
75 |
</connection>
|
76 |
<matrixrate_write>
|
@@ -89,15 +80,45 @@
|
|
89 |
<shipping>
|
90 |
<carriers>
|
91 |
<matrixrate>
|
92 |
-
<class>
|
93 |
</matrixrate>
|
94 |
</carriers>
|
95 |
</shipping>
|
96 |
</sales>
|
|
|
|
|
|
|
|
|
|
|
97 |
</global>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
98 |
<default>
|
99 |
<carriers>
|
100 |
<matrixrate>
|
|
|
101 |
<active>0</active>
|
102 |
<remove_virtual>0</remove_virtual>
|
103 |
<sallowspecific>0</sallowspecific>
|
1 |
<?xml version="1.0"?>
|
2 |
<!--
|
3 |
/**
|
4 |
+
* Webshopapps Shipping Module
|
5 |
*
|
6 |
* NOTICE OF LICENSE
|
7 |
*
|
19 |
* versions in the future. If you wish to customize Magento for your
|
20 |
* needs please refer to http://www.magentocommerce.com for more information.
|
21 |
*
|
22 |
+
* Shipping MatrixRates
|
23 |
+
*
|
24 |
+
* @category Webshopapps
|
25 |
+
* @package Webshopapps_Matrixrate
|
26 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
27 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
28 |
+
* @author Karen Baker <sales@webshopapps.com>
|
29 |
*/
|
30 |
+
|
31 |
-->
|
32 |
<config>
|
33 |
<modules>
|
34 |
+
<Webshopapps_Matrixrate>
|
35 |
+
<version>2.0.2</version>
|
36 |
+
</Webshopapps_Matrixrate>
|
|
|
|
|
|
|
|
|
|
|
37 |
</modules>
|
38 |
<global>
|
|
|
39 |
<models>
|
40 |
+
<matrixrate>
|
41 |
+
<class>Webshopapps_Matrixrate_Model</class>
|
42 |
+
</matrixrate>
|
43 |
+
<matrixrate_adminhtml>
|
44 |
+
<class>Webshopapps_Matrixrate_Adminhtml_Model</class>
|
45 |
+
</matrixrate_adminhtml>
|
46 |
<matrixrate_shipping>
|
47 |
+
<class>Webshopapps_Matrixrate_Model</class>
|
48 |
<resourceModel>matrixrate_mysql4</resourceModel>
|
49 |
</matrixrate_shipping>
|
50 |
<matrixrate_mysql4>
|
51 |
+
<class>Webshopapps_Matrixrate_Model_Mysql4</class>
|
52 |
<entities>
|
53 |
<matrixrate>
|
54 |
<table>shipping_matrixrate</table>
|
56 |
</entities>
|
57 |
</matrixrate_mysql4>
|
58 |
</models>
|
|
|
|
|
59 |
<resources>
|
|
|
60 |
<matrixrate_setup>
|
|
|
61 |
<setup>
|
62 |
+
<module>Webshopapps_Matrixrate</module>
|
|
|
63 |
</setup>
|
|
|
64 |
<connection>
|
|
|
65 |
<use>core_setup</use>
|
66 |
</connection>
|
67 |
<matrixrate_write>
|
80 |
<shipping>
|
81 |
<carriers>
|
82 |
<matrixrate>
|
83 |
+
<class>Webshopapps_Matrixrate_Model_Carrier_Matrixrate</class>
|
84 |
</matrixrate>
|
85 |
</carriers>
|
86 |
</shipping>
|
87 |
</sales>
|
88 |
+
<helpers>
|
89 |
+
<matrixrate>
|
90 |
+
<class>Webshopapps_Matrixrate_Helper</class>
|
91 |
+
</matrixrate>
|
92 |
+
</helpers>
|
93 |
</global>
|
94 |
+
<frontend>
|
95 |
+
|
96 |
+
<translate>
|
97 |
+
<modules>
|
98 |
+
<Webshopapps_Matrixrate>
|
99 |
+
<files>
|
100 |
+
<default>Webshopapps_Matrixrate.csv</default>
|
101 |
+
</files>
|
102 |
+
</Webshopapps_Matrixrate>
|
103 |
+
</modules>
|
104 |
+
</translate>
|
105 |
+
</frontend>
|
106 |
+
<adminhtml>
|
107 |
+
<translate>
|
108 |
+
|
109 |
+
<modules>
|
110 |
+
<Webshopapps_Matrixrate>
|
111 |
+
<files>
|
112 |
+
<default>Webshopapps_Matrixrate.csv</default>
|
113 |
+
</files>
|
114 |
+
</Webshopapps_Matrixrate>
|
115 |
+
</modules>
|
116 |
+
</translate>
|
117 |
+
</adminhtml>
|
118 |
<default>
|
119 |
<carriers>
|
120 |
<matrixrate>
|
121 |
+
<condition_name>package_weight</condition_name>
|
122 |
<active>0</active>
|
123 |
<remove_virtual>0</remove_virtual>
|
124 |
<sallowspecific>0</sallowspecific>
|
app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/etc/system.xml
RENAMED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<!--
|
3 |
/**
|
4 |
-
*
|
5 |
*
|
6 |
* NOTICE OF LICENSE
|
7 |
*
|
@@ -19,12 +19,15 @@
|
|
19 |
* versions in the future. If you wish to customize Magento for your
|
20 |
* needs please refer to http://www.magentocommerce.com for more information.
|
21 |
*
|
22 |
-
*
|
23 |
-
*
|
24 |
-
* @
|
|
|
|
|
25 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
26 |
-
* @author Karen Baker <
|
27 |
*/
|
|
|
28 |
-->
|
29 |
<config>
|
30 |
<sections>
|
@@ -40,10 +43,10 @@
|
|
40 |
<comment>
|
41 |
<![CDATA[
|
42 |
<div style="padding:10px;background-color:#fff;border:1px solid #ddd;margin-bottom:7px;">
|
43 |
-
This module was developed by <a href="http://www.webshopapps.com" target="_blank">www.
|
44 |
-
<br/>For
|
45 |
-
<br/>
|
46 |
-
<br
|
47 |
</div>
|
48 |
]]>
|
49 |
</comment>
|
@@ -127,7 +130,7 @@
|
|
127 |
<show_in_store>1</show_in_store>
|
128 |
</zip_range>
|
129 |
<remove_virtual translate="label">
|
130 |
-
<label>Exclude
|
131 |
<frontend_type>select</frontend_type>
|
132 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
133 |
<sort_order>70</sort_order>
|
@@ -135,37 +138,27 @@
|
|
135 |
<show_in_website>1</show_in_website>
|
136 |
<show_in_store>1</show_in_store>
|
137 |
</remove_virtual>
|
138 |
-
<uk_filtering translate="label">
|
139 |
-
<label>Use Special UK Postcode Filtering</label>
|
140 |
-
<frontend_type>select</frontend_type>
|
141 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
142 |
-
<sort_order>71</sort_order>
|
143 |
-
<show_in_default>1</show_in_default>
|
144 |
-
<show_in_website>1</show_in_website>
|
145 |
-
<show_in_store>1</show_in_store>
|
146 |
-
</uk_filtering>
|
147 |
<condition_name translate="label">
|
148 |
<label>Condition</label>
|
149 |
<frontend_type>select</frontend_type>
|
150 |
-
<source_model>
|
151 |
<sort_order>4</sort_order>
|
152 |
<show_in_default>1</show_in_default>
|
153 |
<show_in_website>1</show_in_website>
|
154 |
<show_in_store>0</show_in_store>
|
155 |
</condition_name>
|
156 |
-
|
157 |
-
|
158 |
-
|
159 |
-
|
160 |
-
|
161 |
-
|
162 |
-
|
163 |
-
|
164 |
-
</export>-->
|
165 |
<import translate="label">
|
166 |
<label>Import</label>
|
167 |
<frontend_type>import</frontend_type>
|
168 |
-
<backend_model>
|
169 |
<sort_order>70</sort_order>
|
170 |
<show_in_default>0</show_in_default>
|
171 |
<show_in_website>1</show_in_website>
|
@@ -218,6 +211,7 @@
|
|
218 |
<label>Show method if not applicable</label>
|
219 |
<frontend_type>select</frontend_type>
|
220 |
<sort_order>120</sort_order>
|
|
|
221 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
222 |
<show_in_default>1</show_in_default>
|
223 |
<show_in_website>1</show_in_website>
|
1 |
<?xml version="1.0"?>
|
2 |
<!--
|
3 |
/**
|
4 |
+
* Webshopapps Shipping Module
|
5 |
*
|
6 |
* NOTICE OF LICENSE
|
7 |
*
|
19 |
* versions in the future. If you wish to customize Magento for your
|
20 |
* needs please refer to http://www.magentocommerce.com for more information.
|
21 |
*
|
22 |
+
* Shipping MatrixRates
|
23 |
+
*
|
24 |
+
* @category Webshopapps
|
25 |
+
* @package Webshopapps_Matrixrate
|
26 |
+
* @copyright Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
|
27 |
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
28 |
+
* @author Karen Baker <sales@webshopapps.com>
|
29 |
*/
|
30 |
+
|
31 |
-->
|
32 |
<config>
|
33 |
<sections>
|
43 |
<comment>
|
44 |
<![CDATA[
|
45 |
<div style="padding:10px;background-color:#fff;border:1px solid #ddd;margin-bottom:7px;">
|
46 |
+
This module was developed by <a href="http://www.webshopapps.com" target="_blank">www.WebShopApps.com</a> - <b>Magento Shipping Extension Specialists</b>.
|
47 |
+
<br/>For docs & examples refer to the WebShopApps <a href="https://sites.google.com/a/webshopapps.com/webshopapps-wiki/extensions/matrix-rates">wiki</a>.
|
48 |
+
<br/>We offer <a href="http://webshopapps.com/shipping-extensions/most-popular/premium-matrixrate-shipping-extension.html" target="_blank">Premium Matrixrate</a> for our commercial users, masses of features to reduce maintenance time.
|
49 |
+
<br/>We have the largest selections of <a href="http://www.webshopapps.com" target="_blank">shipping extensions</a> on Magento.</a>
|
50 |
</div>
|
51 |
]]>
|
52 |
</comment>
|
130 |
<show_in_store>1</show_in_store>
|
131 |
</zip_range>
|
132 |
<remove_virtual translate="label">
|
133 |
+
<label>Exclude virtual from cart price</label>
|
134 |
<frontend_type>select</frontend_type>
|
135 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
136 |
<sort_order>70</sort_order>
|
138 |
<show_in_website>1</show_in_website>
|
139 |
<show_in_store>1</show_in_store>
|
140 |
</remove_virtual>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
141 |
<condition_name translate="label">
|
142 |
<label>Condition</label>
|
143 |
<frontend_type>select</frontend_type>
|
144 |
+
<source_model>matrixrate_adminhtml/system_config_source_shipping_matrixrate</source_model>
|
145 |
<sort_order>4</sort_order>
|
146 |
<show_in_default>1</show_in_default>
|
147 |
<show_in_website>1</show_in_website>
|
148 |
<show_in_store>0</show_in_store>
|
149 |
</condition_name>
|
150 |
+
<!-- <export translate="label">
|
151 |
+
<label>Export</label>
|
152 |
+
<frontend_type>export</frontend_type>
|
153 |
+
<sort_order>6</sort_order>
|
154 |
+
<show_in_default>0</show_in_default>
|
155 |
+
<show_in_website>1</show_in_website>
|
156 |
+
<show_in_store>0</show_in_store>
|
157 |
+
</export>-->
|
|
|
158 |
<import translate="label">
|
159 |
<label>Import</label>
|
160 |
<frontend_type>import</frontend_type>
|
161 |
+
<backend_model>matrixrate_adminhtml/system_config_backend_shipping_matrixrate</backend_model>
|
162 |
<sort_order>70</sort_order>
|
163 |
<show_in_default>0</show_in_default>
|
164 |
<show_in_website>1</show_in_website>
|
211 |
<label>Show method if not applicable</label>
|
212 |
<frontend_type>select</frontend_type>
|
213 |
<sort_order>120</sort_order>
|
214 |
+
<frontend_class>shipping-skip-hide</frontend_class>
|
215 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
216 |
<show_in_default>1</show_in_default>
|
217 |
<show_in_website>1</show_in_website>
|
app/code/community/{Auctionmaid → Webshopapps}/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.1.php
RENAMED
File without changes
|
app/code/community/{Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.1.php → Webshopapps/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.2.php}
RENAMED
@@ -6,13 +6,12 @@ $installer->startSetup();
|
|
6 |
|
7 |
$installer->run("
|
8 |
|
9 |
-
|
10 |
-
CREATE TABLE {$this->getTable('shipping_matrixrate')} (
|
11 |
pk int(10) unsigned NOT NULL auto_increment,
|
12 |
website_id int(11) NOT NULL default '0',
|
13 |
dest_country_id varchar(4) NOT NULL default '0',
|
14 |
dest_region_id int(10) NOT NULL default '0',
|
15 |
-
dest_city varchar(
|
16 |
dest_zip varchar(10) NOT NULL default '',
|
17 |
dest_zip_to varchar(10) NOT NULL default '',
|
18 |
condition_name varchar(20) NOT NULL default '',
|
6 |
|
7 |
$installer->run("
|
8 |
|
9 |
+
CREATE TABLE IF NOT EXISTS {$this->getTable('shipping_matrixrate')} (
|
|
|
10 |
pk int(10) unsigned NOT NULL auto_increment,
|
11 |
website_id int(11) NOT NULL default '0',
|
12 |
dest_country_id varchar(4) NOT NULL default '0',
|
13 |
dest_region_id int(10) NOT NULL default '0',
|
14 |
+
dest_city varchar(30) NOT NULL default '',
|
15 |
dest_zip varchar(10) NOT NULL default '',
|
16 |
dest_zip_to varchar(10) NOT NULL default '',
|
17 |
condition_name varchar(20) NOT NULL default '',
|
app/code/community/{Auctionmaid/docs/manual install.sql → Webshopapps/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.1-2.0.2.php}
RENAMED
@@ -1,4 +1,12 @@
|
|
1 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2 |
pk int(10) unsigned NOT NULL auto_increment,
|
3 |
website_id int(11) NOT NULL default '0',
|
4 |
dest_country_id varchar(4) NOT NULL default '0',
|
@@ -13,6 +21,13 @@ CREATE TABLE shipping_matrixrate (
|
|
13 |
cost decimal(12,4) NOT NULL default '0.0000',
|
14 |
delivery_type varchar(255) NOT NULL default '',
|
15 |
PRIMARY KEY(`pk`),
|
16 |
-
UNIQUE KEY (`website_id`,`dest_country_id`,`dest_region_id`,`dest_city`,`dest_zip`,`dest_zip_to`,`condition_name`,`condition_from_value`,`condition_to_value`,`delivery_type`)
|
17 |
-
) ;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
18 |
|
1 |
+
<?php
|
2 |
+
|
3 |
+
$installer = $this;
|
4 |
+
|
5 |
+
$installer->startSetup();
|
6 |
+
|
7 |
+
$installer->run("
|
8 |
+
|
9 |
+
CREATE TABLE IF NOT EXISTS {$this->getTable('shipping_matrixrate')} (
|
10 |
pk int(10) unsigned NOT NULL auto_increment,
|
11 |
website_id int(11) NOT NULL default '0',
|
12 |
dest_country_id varchar(4) NOT NULL default '0',
|
21 |
cost decimal(12,4) NOT NULL default '0.0000',
|
22 |
delivery_type varchar(255) NOT NULL default '',
|
23 |
PRIMARY KEY(`pk`),
|
24 |
+
UNIQUE KEY `dest_country` (`website_id`,`dest_country_id`,`dest_region_id`,`dest_city`,`dest_zip`,`dest_zip_to`,`condition_name`,`condition_from_value`,`condition_to_value`,`delivery_type`)
|
25 |
+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
26 |
+
|
27 |
+
|
28 |
+
|
29 |
+
");
|
30 |
+
|
31 |
+
$installer->endSetup();
|
32 |
+
|
33 |
|
app/etc/modules/Auctionmaid_Matrixrate.xml
DELETED
@@ -1,37 +0,0 @@
|
|
1 |
-
<?xml version="1.0"?>
|
2 |
-
<config>
|
3 |
-
<modules>
|
4 |
-
<Auctionmaid_Matrixrate>
|
5 |
-
<active>true</active>
|
6 |
-
<codePool>community</codePool>
|
7 |
-
</Auctionmaid_Matrixrate>
|
8 |
-
<Auctionmaid_Adminhtml>
|
9 |
-
<active>true</active>
|
10 |
-
<codePool>community</codePool>
|
11 |
-
</Auctionmaid_Adminhtml>
|
12 |
-
</modules>
|
13 |
-
<global>
|
14 |
-
<models>
|
15 |
-
<adminhtml>
|
16 |
-
<rewrite>
|
17 |
-
<system_config_source_shipping_matrixrate>Auctionmaid_Adminhtml_Model_System_Config_Source_Shipping_Matrixrate</system_config_source_shipping_matrixrate>
|
18 |
-
</rewrite>
|
19 |
-
</adminhtml>
|
20 |
-
</models>
|
21 |
-
<models>
|
22 |
-
<adminhtml>
|
23 |
-
<rewrite>
|
24 |
-
<system_config_backend_shipping_matrixrate>Auctionmaid_Adminhtml_Model_System_Config_Backend_Shipping_Matrixrate</system_config_backend_shipping_matrixrate>
|
25 |
-
</rewrite>
|
26 |
-
</adminhtml>
|
27 |
-
</models>
|
28 |
-
<models>
|
29 |
-
<shipping>
|
30 |
-
<rewrite>
|
31 |
-
<carrier_matrixrate>Auctionmaid_Matrixrate_Model_Carrier_Matrixrate</carrier_matrixrate>
|
32 |
-
<mysql4_carrier_matrixrate>Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate</mysql4_carrier_matrixrate>
|
33 |
-
</rewrite>
|
34 |
-
</shipping>
|
35 |
-
</models>
|
36 |
-
</global>
|
37 |
-
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/etc/modules/Webshopapps_Matrixrate.xml
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<config>
|
3 |
+
<modules>
|
4 |
+
<Webshopapps_Matrixrate>
|
5 |
+
<active>true</active>
|
6 |
+
<codePool>community</codePool>
|
7 |
+
<depends>
|
8 |
+
<Mage_Shipping />
|
9 |
+
</depends>
|
10 |
+
</Webshopapps_Matrixrate>
|
11 |
+
</modules>
|
12 |
+
</config>
|
package.xml
CHANGED
@@ -1,26 +1,25 @@
|
|
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>
|
8 |
<extends/>
|
9 |
-
<summary>Multiple Table Rates
|
10 |
-
Ability to filter via Price, Weight or #Items vs Destination. Enhanced filtering on country, region, city, zipcode.
|
11 |
-
Suitable for all countries incl UK, US, AUS, Europe.</summary>
|
12 |
<description>Supports following:
|
13 |
|
14 |
-
- multiple table
|
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 |
<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>sales@webshopapps.com</email></author></authors>
|
21 |
-
<date>2010-
|
22 |
-
<time>06:
|
23 |
-
<contents><target name="
|
24 |
<compatible/>
|
25 |
<dependencies/>
|
26 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Auctionmaid_Matrxrate</name>
|
4 |
+
<version>3.0.0</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>
|
8 |
<extends/>
|
9 |
+
<summary>Multiple Table Rates via CSV. Filter by country, region,city, zipcode. Numeric Postcode ranges, and enhanced pattern matching supported. Ability to exclude items from free shipping, and specify collection only.</summary>
|
|
|
|
|
10 |
<description>Supports following:
|
11 |
|
12 |
+
- multiple table rates
|
|
|
13 |
- country, region, city, postcode filtering
|
14 |
- partial postcode filtering, including pattern matching
|
15 |
+
- numerical postcode ranges
|
16 |
+
- option to exclude items from free shipping
|
17 |
+
- collection only option</description>
|
18 |
<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>
|
19 |
<authors><author><name>Karen Baker</name><user>auto-converted</user><email>sales@webshopapps.com</email></author></authors>
|
20 |
+
<date>2010-10-26</date>
|
21 |
+
<time>05:06:35</time>
|
22 |
+
<contents><target name="mageetc"><dir name="modules"><file name="Webshopapps_Matrixrate.xml" hash="ac8b13f26402b2f0e7f6b22c3430fec8"/></dir></target><target name="magecommunity"><dir name="Webshopapps"><dir name="Matrixrate"><dir name="Adminhtml"><dir name="Model"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><file name="Matrixrate.php" hash="b61a484d0568651aa94b61ef8d84b24a"/></dir></dir><dir name="Source"><dir name="Shipping"><file name="Matrixrate.php" hash="37fecc431ab65ac9952ab951292f7815"/></dir></dir></dir></dir></dir></dir><dir name="etc"><file name="config.xml" hash="9c5c8d01dce6f7e036bb4d1e53706741"/><file name="system.xml" hash="b60e7f9efdb31976471c91e04ac556f3"/></dir><dir name="Helper"><file name="Data.php" hash="97307283fd4c85ed72a699ab4be68661"/></dir><dir name="Model"><dir name="Carrier"><file name="Matrixrate.php" hash="e3d52565200a038a851a50e4484e6ad8"/></dir><dir name="Mysql4"><dir name="Carrier"><file name="Matrixrate.php" hash="aa5b77ed44de4b973eecccadbe887232"/><dir name="Matrixrate"><file name="Collection.php" hash="def8a766d0d73df07e5a4a4e5bb26422"/></dir></dir></dir></dir><dir name="sql"><dir name="matrixrate_setup"><file name="mysql4-install-2.0.1.php" hash="52a413f99ce3d571a067cdfb677bbf32"/><file name="mysql4-install-2.0.2.php" hash="b6530f7e95e610db357ed46bc23629b9"/><file name="mysql4-upgrade-2.0.1-2.0.2.php" hash="b6530f7e95e610db357ed46bc23629b9"/></dir></dir></dir></dir></target></contents>
|
23 |
<compatible/>
|
24 |
<dependencies/>
|
25 |
</package>
|