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.1 |
| Comparing to | |
| See all releases | |
Code changes from version 2.0.9 to 3.0.1
- app/code/community/Auctionmaid/Freeoptionalshipping/Model/Carrier/Freeoptionalshipping.php +0 -117
- app/code/community/Auctionmaid/Freeoptionalshipping/etc/config.xml +0 -89
- app/code/community/Auctionmaid/Freeoptionalshipping/etc/system.xml +0 -123
- app/code/community/Auctionmaid/Matrixrate/Model/Carrier/Matrixrate.php +51 -6
- app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php +0 -1
- app/code/community/Auctionmaid/Matrixrate/etc/config.xml +3 -0
- app/code/community/Auctionmaid/Matrixrate/etc/system.xml +57 -14
- app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-install-1.0.5.php +0 -42
- app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.0.php +0 -42
- app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.1.php +1 -9
- app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-uninstall-2.0.0.php +0 -12
- app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.0.php +0 -42
- app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.1.php +1 -9
- app/code/community/Auctionmaid/docs/AuctionMaid MatrixRate Shipping Module.pdf +0 -0
- app/code/community/Auctionmaid/docs/manual install.sql +0 -9
- app/etc/modules/Auctionmaid_Freeoptionalshipping.xml +0 -9
- package.xml +6 -6
app/code/community/Auctionmaid/Freeoptionalshipping/Model/Carrier/Freeoptionalshipping.php
DELETED
|
@@ -1,117 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
/**
|
| 3 |
-
* Magento Auctionmaid Shipping Module
|
| 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 |
-
* Conditional Free Shipping Module - where if attribute exclude_free_shipping is set
|
| 22 |
-
* will result in free shipping being disabled for checkout
|
| 23 |
-
*
|
| 24 |
-
* @category Auctionmaid
|
| 25 |
-
* @package Auctionmaid_Freeoptionalshipping
|
| 26 |
-
* @copyright Copyright (c) 2008 Auction Maid (http://www.auctionmaid.com)
|
| 27 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 28 |
-
* @author Karen Baker <enquiries@auctionmaid.com>
|
| 29 |
-
*/
|
| 30 |
-
class Auctionmaid_Freeoptionalshipping_Model_Carrier_Freeoptionalshipping
|
| 31 |
-
extends Mage_Shipping_Model_Carrier_Abstract
|
| 32 |
-
implements Mage_Shipping_Model_Carrier_Interface
|
| 33 |
-
{
|
| 34 |
-
|
| 35 |
-
protected $_code = 'freeoptionalshipping';
|
| 36 |
-
|
| 37 |
-
/**
|
| 38 |
-
* FreeShipping Rates Collector
|
| 39 |
-
*
|
| 40 |
-
* @param Mage_Shipping_Model_Rate_Request $request
|
| 41 |
-
* @return Mage_Shipping_Model_Rate_Result
|
| 42 |
-
*/
|
| 43 |
-
public function collectRates(Mage_Shipping_Model_Rate_Request $request)
|
| 44 |
-
{
|
| 45 |
-
if (!$this->getConfigFlag('active')) {
|
| 46 |
-
return false;
|
| 47 |
-
}
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
$result = Mage::getModel('shipping/rate_result');
|
| 52 |
-
$packageValue = $request->getPackageValueWithDiscount();
|
| 53 |
-
|
| 54 |
-
$this->_updateFreeMethodQuote($request);
|
| 55 |
-
|
| 56 |
-
$allow = ($request->getFreeShipping())
|
| 57 |
-
|| ($packageValue >= $this->getConfigData('free_shipping_subtotal'));
|
| 58 |
-
|
| 59 |
-
if ($allow) {
|
| 60 |
-
|
| 61 |
-
// now make sure free shipping is allowed for this product
|
| 62 |
-
$items = $request->getAllItems();
|
| 63 |
-
foreach($items as $item) {
|
| 64 |
-
$product = Mage::getModel('catalog/product')->loadByAttribute('entity_id', $item->getProductId(), 'exclude_free_shipping');
|
| 65 |
-
if ($product->getData('exclude_free_shipping')) {
|
| 66 |
-
return false;
|
| 67 |
-
}
|
| 68 |
-
}
|
| 69 |
-
|
| 70 |
-
$method = Mage::getModel('shipping/rate_result_method');
|
| 71 |
-
|
| 72 |
-
$method->setCarrier('freeoptionalshipping');
|
| 73 |
-
$method->setCarrierTitle($this->getConfigData('title'));
|
| 74 |
-
|
| 75 |
-
$method->setMethod('freeoptionalshipping');
|
| 76 |
-
$method->setMethodTitle($this->getConfigData('name'));
|
| 77 |
-
|
| 78 |
-
$method->setPrice('0.00');
|
| 79 |
-
$method->setCost('0.00');
|
| 80 |
-
|
| 81 |
-
$result->append($method);
|
| 82 |
-
}
|
| 83 |
-
|
| 84 |
-
return $result;
|
| 85 |
-
}
|
| 86 |
-
|
| 87 |
-
/**
|
| 88 |
-
* Allows free shipping when all product items have free shipping (promotions etc.)
|
| 89 |
-
*
|
| 90 |
-
* @param Mage_Shipping_Model_Rate_Request $request
|
| 91 |
-
* @return void
|
| 92 |
-
*/
|
| 93 |
-
protected function _updateFreeMethodQuote($request)
|
| 94 |
-
{
|
| 95 |
-
$freeShipping = false;
|
| 96 |
-
$items = $request->getAllItems();
|
| 97 |
-
$c = count($items);
|
| 98 |
-
for ($i = 0; $i < $c; $i++) {
|
| 99 |
-
if ($items[$i]->getProduct() instanceof Mage_Catalog_Model_Product) {
|
| 100 |
-
if ($items[$i]->getFreeShipping()) {
|
| 101 |
-
$freeShipping = true;
|
| 102 |
-
} else {
|
| 103 |
-
return;
|
| 104 |
-
}
|
| 105 |
-
}
|
| 106 |
-
}
|
| 107 |
-
if ($freeShipping) {
|
| 108 |
-
$request->setFreeShipping(true);
|
| 109 |
-
}
|
| 110 |
-
}
|
| 111 |
-
|
| 112 |
-
public function getAllowedMethods()
|
| 113 |
-
{
|
| 114 |
-
return array('freeshipping'=>$this->getConfigData('name'));
|
| 115 |
-
}
|
| 116 |
-
|
| 117 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/Freeoptionalshipping/etc/config.xml
DELETED
|
@@ -1,89 +0,0 @@
|
|
| 1 |
-
<?xml version="1.0"?>
|
| 2 |
-
<!--
|
| 3 |
-
/**
|
| 4 |
-
* Magento Auctionmaid Shipping Module
|
| 5 |
-
*
|
| 6 |
-
* NOTICE OF LICENSE
|
| 7 |
-
*
|
| 8 |
-
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
-
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
-
* It is also available through the world-wide-web at this URL:
|
| 11 |
-
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
-
* If you did not receive a copy of the license and are unable to
|
| 13 |
-
* obtain it through the world-wide-web, please send an email
|
| 14 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
-
*
|
| 16 |
-
* DISCLAIMER
|
| 17 |
-
*
|
| 18 |
-
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 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 |
-
* @category Auctionmaid
|
| 23 |
-
* @package Auctionmaid_Freeoptionalshipping
|
| 24 |
-
* @copyright Copyright (c) 2008 Auction Maid (http://www.auctionmaid.com)
|
| 25 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
-
* @author Karen Baker <enquiries@auctionmaid.com>
|
| 27 |
-
*/
|
| 28 |
-
-->
|
| 29 |
-
<config>
|
| 30 |
-
<modules>
|
| 31 |
-
<!-- declare module's version information -->
|
| 32 |
-
<Auctionmaid_Freeoptionalshipping>
|
| 33 |
-
<!-- this version number will be used for database upgrades -->
|
| 34 |
-
<version>1.0.5</version>
|
| 35 |
-
<depends>
|
| 36 |
-
<Mage_Shipping />
|
| 37 |
-
</depends>
|
| 38 |
-
</Auctionmaid_Freeoptionalshipping>
|
| 39 |
-
</modules>
|
| 40 |
-
<global>
|
| 41 |
-
<!-- declare model group for new module -->
|
| 42 |
-
<models>
|
| 43 |
-
<!-- model group alias to be used in Mage::getModel() -->
|
| 44 |
-
<freeoptionalshipping>
|
| 45 |
-
<!-- base class name for the model group -->
|
| 46 |
-
<class>Auctionmaid_Freeoptionalshipping_Model</class>
|
| 47 |
-
</freeoptionalshipping>
|
| 48 |
-
</models>
|
| 49 |
-
|
| 50 |
-
<!-- declare resource setup for new module -->
|
| 51 |
-
<resources>
|
| 52 |
-
<!-- resource identifier -->
|
| 53 |
-
<Freeoptionalshipping_setup>
|
| 54 |
-
<!-- specify that this resource is a setup resource and used for upgrades -->
|
| 55 |
-
<setup>
|
| 56 |
-
<!-- which module to look for install/upgrade files in -->
|
| 57 |
-
<module>Auctionmaid_Freeoptionalshipping</module>
|
| 58 |
-
</setup>
|
| 59 |
-
<!-- specify database connection for this resource -->
|
| 60 |
-
<connection>
|
| 61 |
-
<!-- do not create new connection, use predefined core setup connection -->
|
| 62 |
-
<use>core_setup</use>
|
| 63 |
-
</connection>
|
| 64 |
-
</Freeoptionalshipping_setup>
|
| 65 |
-
</resources>
|
| 66 |
-
<sales>
|
| 67 |
-
<shipping>
|
| 68 |
-
<carriers>
|
| 69 |
-
<freeoptionalshipping>
|
| 70 |
-
<class>Auctionmaid_Freeoptionalshipping_Model_Carrier_Freeoptionalshipping</class>
|
| 71 |
-
</freeoptionalshipping>
|
| 72 |
-
</carriers>
|
| 73 |
-
</shipping>
|
| 74 |
-
</sales>
|
| 75 |
-
</global>
|
| 76 |
-
<default>
|
| 77 |
-
<carriers>
|
| 78 |
-
<freeoptionalshipping>
|
| 79 |
-
<active>0</active>
|
| 80 |
-
<sallowspecific>0</sallowspecific>
|
| 81 |
-
<cutoff_cost>50</cutoff_cost>
|
| 82 |
-
<model>freeoptionalshipping/carrier_freeoptionalshipping</model>
|
| 83 |
-
<name>Free</name>
|
| 84 |
-
<title>Free Shipping</title>
|
| 85 |
-
<specificerrmsg>This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.</specificerrmsg>
|
| 86 |
-
</freeoptionalshipping>
|
| 87 |
-
</carriers>
|
| 88 |
-
</default>
|
| 89 |
-
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/Freeoptionalshipping/etc/system.xml
DELETED
|
@@ -1,123 +0,0 @@
|
|
| 1 |
-
<?xml version="1.0"?>
|
| 2 |
-
<!--
|
| 3 |
-
/**
|
| 4 |
-
* Magento Auctionmaid Shipping Module
|
| 5 |
-
*
|
| 6 |
-
* NOTICE OF LICENSE
|
| 7 |
-
*
|
| 8 |
-
* This source file is subject to the Open Software License (OSL 3.0)
|
| 9 |
-
* that is bundled with this package in the file LICENSE.txt.
|
| 10 |
-
* It is also available through the world-wide-web at this URL:
|
| 11 |
-
* http://opensource.org/licenses/osl-3.0.php
|
| 12 |
-
* If you did not receive a copy of the license and are unable to
|
| 13 |
-
* obtain it through the world-wide-web, please send an email
|
| 14 |
-
* to license@magentocommerce.com so we can send you a copy immediately.
|
| 15 |
-
*
|
| 16 |
-
* DISCLAIMER
|
| 17 |
-
*
|
| 18 |
-
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
| 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 |
-
* @category Auctionmaid
|
| 23 |
-
* @package Auctionmaid_Freeoptionalshipping
|
| 24 |
-
* @copyright Copyright (c) 2008 Auction Maid (http://www.auctionmaid.com)
|
| 25 |
-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
-
* @author Karen Baker <enquiries@auctionmaid.com>
|
| 27 |
-
*/
|
| 28 |
-
-->
|
| 29 |
-
<config>
|
| 30 |
-
<sections>
|
| 31 |
-
<carriers>
|
| 32 |
-
<groups>
|
| 33 |
-
<freeoptionalshipping translate="label" module="shipping">
|
| 34 |
-
<label>Free Optional Shipping</label>
|
| 35 |
-
<frontend_type>text</frontend_type>
|
| 36 |
-
<sort_order>2</sort_order>
|
| 37 |
-
<show_in_default>1</show_in_default>
|
| 38 |
-
<show_in_website>1</show_in_website>
|
| 39 |
-
<show_in_store>1</show_in_store>
|
| 40 |
-
<fields>
|
| 41 |
-
<active translate="label">
|
| 42 |
-
<label>Enabled</label>
|
| 43 |
-
<frontend_type>select</frontend_type>
|
| 44 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 45 |
-
<sort_order>1</sort_order>
|
| 46 |
-
<show_in_default>1</show_in_default>
|
| 47 |
-
<show_in_website>1</show_in_website>
|
| 48 |
-
<show_in_store>1</show_in_store>
|
| 49 |
-
</active>
|
| 50 |
-
<free_shipping_subtotal translate="label">
|
| 51 |
-
<label>Minimum order amount</label>
|
| 52 |
-
<frontend_type>text</frontend_type>
|
| 53 |
-
<sort_order>4</sort_order>
|
| 54 |
-
<show_in_default>1</show_in_default>
|
| 55 |
-
<show_in_website>1</show_in_website>
|
| 56 |
-
<show_in_store>1</show_in_store>
|
| 57 |
-
</free_shipping_subtotal>
|
| 58 |
-
<name translate="label">
|
| 59 |
-
<label>Method name</label>
|
| 60 |
-
<frontend_type>text</frontend_type>
|
| 61 |
-
<sort_order>3</sort_order>
|
| 62 |
-
<show_in_default>1</show_in_default>
|
| 63 |
-
<show_in_website>1</show_in_website>
|
| 64 |
-
<show_in_store>1</show_in_store>
|
| 65 |
-
</name>
|
| 66 |
-
<sort_order translate="label">
|
| 67 |
-
<label>Sort order</label>
|
| 68 |
-
<frontend_type>text</frontend_type>
|
| 69 |
-
<sort_order>100</sort_order>
|
| 70 |
-
<show_in_default>1</show_in_default>
|
| 71 |
-
<show_in_website>1</show_in_website>
|
| 72 |
-
<show_in_store>1</show_in_store>
|
| 73 |
-
</sort_order>
|
| 74 |
-
<title translate="label">
|
| 75 |
-
<label>Title</label>
|
| 76 |
-
<frontend_type>text</frontend_type>
|
| 77 |
-
<sort_order>2</sort_order>
|
| 78 |
-
<show_in_default>1</show_in_default>
|
| 79 |
-
<show_in_website>1</show_in_website>
|
| 80 |
-
<show_in_store>1</show_in_store>
|
| 81 |
-
</title>
|
| 82 |
-
<sallowspecific translate="label">
|
| 83 |
-
<label>Ship to applicable countries</label>
|
| 84 |
-
<frontend_type>select</frontend_type>
|
| 85 |
-
<sort_order>90</sort_order>
|
| 86 |
-
<frontend_class>shipping-applicable-country</frontend_class>
|
| 87 |
-
<source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
|
| 88 |
-
<show_in_default>1</show_in_default>
|
| 89 |
-
<show_in_website>1</show_in_website>
|
| 90 |
-
<show_in_store>1</show_in_store>
|
| 91 |
-
</sallowspecific>
|
| 92 |
-
<specificcountry translate="label">
|
| 93 |
-
<label>Ship to Specific countries</label>
|
| 94 |
-
<frontend_type>multiselect</frontend_type>
|
| 95 |
-
<sort_order>91</sort_order>
|
| 96 |
-
<source_model>adminhtml/system_config_source_country</source_model>
|
| 97 |
-
<show_in_default>1</show_in_default>
|
| 98 |
-
<show_in_website>1</show_in_website>
|
| 99 |
-
<show_in_store>1</show_in_store>
|
| 100 |
-
</specificcountry>
|
| 101 |
-
<showmethod translate="label">
|
| 102 |
-
<label>Show method if not applicable</label>
|
| 103 |
-
<frontend_type>select</frontend_type>
|
| 104 |
-
<sort_order>92</sort_order>
|
| 105 |
-
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 106 |
-
<show_in_default>1</show_in_default>
|
| 107 |
-
<show_in_website>1</show_in_website>
|
| 108 |
-
<show_in_store>1</show_in_store>
|
| 109 |
-
</showmethod>
|
| 110 |
-
<specificerrmsg translate="label">
|
| 111 |
-
<label>Displayed Error Message</label>
|
| 112 |
-
<frontend_type>textarea</frontend_type>
|
| 113 |
-
<sort_order>80</sort_order>
|
| 114 |
-
<show_in_default>1</show_in_default>
|
| 115 |
-
<show_in_website>1</show_in_website>
|
| 116 |
-
<show_in_store>1</show_in_store>
|
| 117 |
-
</specificerrmsg>
|
| 118 |
-
</fields>
|
| 119 |
-
</freeoptionalshipping>
|
| 120 |
-
</groups>
|
| 121 |
-
</carriers>
|
| 122 |
-
</sections>
|
| 123 |
-
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/Matrixrate/Model/Carrier/Matrixrate.php
CHANGED
|
@@ -56,13 +56,59 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
|
|
| 56 |
return false;
|
| 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 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 66 |
foreach ($ratearray as $rate)
|
| 67 |
{
|
| 68 |
if (!empty($rate) && $rate['price'] >= 0) {
|
|
@@ -71,18 +117,17 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
|
|
| 71 |
$method->setCarrier('matrixrate');
|
| 72 |
$method->setCarrierTitle($this->getConfigData('title'));
|
| 73 |
|
| 74 |
-
$method->setMethod('
|
| 75 |
|
| 76 |
$method->setMethodTitle($rate['delivery_type']);
|
| 77 |
|
| 78 |
$shippingPrice = $this->getFinalPriceWithHandlingFee($rate['price']);
|
| 79 |
-
|
| 80 |
-
$method->setPrice($shippingPrice);
|
| 81 |
$method->setCost($rate['cost']);
|
| 82 |
$method->setDeliveryType($rate['delivery_type']);
|
|
|
|
|
|
|
| 83 |
|
| 84 |
$result->append($method);
|
| 85 |
-
$i++;
|
| 86 |
}
|
| 87 |
}
|
| 88 |
|
|
@@ -134,7 +179,7 @@ class Auctionmaid_Matrixrate_Model_Carrier_Matrixrate
|
|
| 134 |
*/
|
| 135 |
public function getAllowedMethods()
|
| 136 |
{
|
| 137 |
-
return array('
|
| 138 |
}
|
| 139 |
|
| 140 |
}
|
| 56 |
return false;
|
| 57 |
}
|
| 58 |
|
| 59 |
+
$freeBoxes = 0;
|
| 60 |
+
$found=false;
|
| 61 |
+
$total=0;
|
| 62 |
+
foreach ($request->getAllItems() as $item) {
|
| 63 |
+
if ($item->getFreeShipping() && !$item->getProduct()->isVirtual()) {
|
| 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 |
+
}
|
| 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);
|
| 77 |
|
| 78 |
$request->setConditionName($this->getConfigData('condition_name') ? $this->getConfigData('condition_name') : $this->_default_condition_name);
|
| 79 |
|
| 80 |
$result = Mage::getModel('shipping/rate_result');
|
| 81 |
$ratearray = $this->getRate($request);
|
| 82 |
|
| 83 |
+
$freeShipping=false;
|
| 84 |
+
|
| 85 |
+
if ($this->getConfigData('enable_free_shipping_threshold') &&
|
| 86 |
+
$this->getConfigData('free_shipping_threshold')!='' &&
|
| 87 |
+
$this->getConfigData('free_shipping_threshold')>0 &&
|
| 88 |
+
$request->getPackageValue()>$this->getConfigData('free_shipping_threshold')) {
|
| 89 |
+
$freeShipping=true;
|
| 90 |
+
}
|
| 91 |
+
if ($this->getConfigData('allow_free_shipping_promotions') &&
|
| 92 |
+
($request->getFreeShipping() === true ||
|
| 93 |
+
$request->getPackageQty() == $this->getFreeBoxes()))
|
| 94 |
+
{
|
| 95 |
+
$freeShipping=true;
|
| 96 |
+
}
|
| 97 |
+
if ($freeShipping)
|
| 98 |
+
{
|
| 99 |
+
$method = Mage::getModel('shipping/rate_result_method');
|
| 100 |
+
$method->setCarrier('matrixrate');
|
| 101 |
+
$method->setCarrierTitle($this->getConfigData('title'));
|
| 102 |
+
$method->setMethod('matrixrate_free');
|
| 103 |
+
$method->setPrice('0.00');
|
| 104 |
+
$method->setMethodTitle($this->getConfigData('free_method_text'));
|
| 105 |
+
$result->append($method);
|
| 106 |
+
|
| 107 |
+
if ($this->getConfigData('show_only_free')) {
|
| 108 |
+
return $result;
|
| 109 |
+
}
|
| 110 |
+
}
|
| 111 |
+
|
| 112 |
foreach ($ratearray as $rate)
|
| 113 |
{
|
| 114 |
if (!empty($rate) && $rate['price'] >= 0) {
|
| 117 |
$method->setCarrier('matrixrate');
|
| 118 |
$method->setCarrierTitle($this->getConfigData('title'));
|
| 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']);
|
| 126 |
$method->setDeliveryType($rate['delivery_type']);
|
| 127 |
+
|
| 128 |
+
$method->setPrice($shippingPrice);
|
| 129 |
|
| 130 |
$result->append($method);
|
|
|
|
| 131 |
}
|
| 132 |
}
|
| 133 |
|
| 179 |
*/
|
| 180 |
public function getAllowedMethods()
|
| 181 |
{
|
| 182 |
+
return array('matrixrate'=>$this->getConfigData('name'));
|
| 183 |
}
|
| 184 |
|
| 185 |
}
|
app/code/community/Auctionmaid/Matrixrate/Model/Mysql4/Carrier/Matrixrate.php
CHANGED
|
@@ -147,7 +147,6 @@ class Auctionmaid_Matrixrate_Model_Mysql4_Carrier_Matrixrate extends Mage_Core_M
|
|
| 147 |
pdo has an issue. we cannot use bind
|
| 148 |
*/
|
| 149 |
|
| 150 |
-
|
| 151 |
$newdata=array();
|
| 152 |
$row = $read->fetchAll($select);
|
| 153 |
if (!empty($row))
|
| 147 |
pdo has an issue. we cannot use bind
|
| 148 |
*/
|
| 149 |
|
|
|
|
| 150 |
$newdata=array();
|
| 151 |
$row = $read->fetchAll($select);
|
| 152 |
if (!empty($row))
|
app/code/community/Auctionmaid/Matrixrate/etc/config.xml
CHANGED
|
@@ -100,6 +100,9 @@
|
|
| 100 |
<matrixrate>
|
| 101 |
<active>0</active>
|
| 102 |
<sallowspecific>0</sallowspecific>
|
|
|
|
|
|
|
|
|
|
| 103 |
<cutoff_cost>50</cutoff_cost>
|
| 104 |
<model>matrixrate_shipping/carrier_matrixrate</model>
|
| 105 |
<name>MatrixRate</name>
|
| 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>
|
| 105 |
+
<free_method_text>Free Shipping</free_method_text>
|
| 106 |
<cutoff_cost>50</cutoff_cost>
|
| 107 |
<model>matrixrate_shipping/carrier_matrixrate</model>
|
| 108 |
<name>MatrixRate</name>
|
app/code/community/Auctionmaid/Matrixrate/etc/system.xml
CHANGED
|
@@ -38,7 +38,7 @@
|
|
| 38 |
<show_in_store>0</show_in_store>
|
| 39 |
<groups>
|
| 40 |
<matrixrate translate="label">
|
| 41 |
-
<label>Matrix Rates</label>
|
| 42 |
<frontend_type>text</frontend_type>
|
| 43 |
<sort_order>2</sort_order>
|
| 44 |
<show_in_default>1</show_in_default>
|
|
@@ -46,18 +46,18 @@
|
|
| 46 |
<show_in_store>1</show_in_store>
|
| 47 |
<fields>
|
| 48 |
<handling_type translate="label">
|
| 49 |
-
<label>Calculate
|
| 50 |
<frontend_type>select</frontend_type>
|
| 51 |
<source_model>shipping/source_handlingType</source_model>
|
| 52 |
-
<sort_order>
|
| 53 |
<show_in_default>1</show_in_default>
|
| 54 |
<show_in_website>1</show_in_website>
|
| 55 |
<show_in_store>0</show_in_store>
|
| 56 |
</handling_type>
|
| 57 |
<handling_fee translate="label">
|
| 58 |
-
<label>Handling
|
| 59 |
<frontend_type>text</frontend_type>
|
| 60 |
-
<sort_order>
|
| 61 |
<show_in_default>1</show_in_default>
|
| 62 |
<show_in_website>1</show_in_website>
|
| 63 |
<show_in_store>1</show_in_store>
|
|
@@ -71,11 +71,54 @@
|
|
| 71 |
<show_in_website>1</show_in_website>
|
| 72 |
<show_in_store>1</show_in_store>
|
| 73 |
</active>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 74 |
<zip_range translate="label">
|
| 75 |
-
<label>Use
|
| 76 |
<frontend_type>select</frontend_type>
|
| 77 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 78 |
-
<sort_order>
|
| 79 |
<show_in_default>1</show_in_default>
|
| 80 |
<show_in_website>1</show_in_website>
|
| 81 |
<show_in_store>1</show_in_store>
|
|
@@ -102,7 +145,7 @@
|
|
| 102 |
<label>Import</label>
|
| 103 |
<frontend_type>import</frontend_type>
|
| 104 |
<backend_model>adminhtml/system_config_backend_shipping_matrixrate</backend_model>
|
| 105 |
-
<sort_order>
|
| 106 |
<show_in_default>0</show_in_default>
|
| 107 |
<show_in_website>1</show_in_website>
|
| 108 |
<show_in_store>0</show_in_store>
|
|
@@ -118,7 +161,7 @@
|
|
| 118 |
<sort_order translate="label">
|
| 119 |
<label>Sort order</label>
|
| 120 |
<frontend_type>text</frontend_type>
|
| 121 |
-
<sort_order>
|
| 122 |
<show_in_default>1</show_in_default>
|
| 123 |
<show_in_website>1</show_in_website>
|
| 124 |
<show_in_store>1</show_in_store>
|
|
@@ -134,7 +177,7 @@
|
|
| 134 |
<sallowspecific translate="label">
|
| 135 |
<label>Ship to applicable countries</label>
|
| 136 |
<frontend_type>select</frontend_type>
|
| 137 |
-
<sort_order>
|
| 138 |
<frontend_class>shipping-applicable-country</frontend_class>
|
| 139 |
<source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
|
| 140 |
<show_in_default>1</show_in_default>
|
|
@@ -142,9 +185,9 @@
|
|
| 142 |
<show_in_store>1</show_in_store>
|
| 143 |
</sallowspecific>
|
| 144 |
<specificcountry translate="label">
|
| 145 |
-
<label>Ship to
|
| 146 |
<frontend_type>multiselect</frontend_type>
|
| 147 |
-
<sort_order>
|
| 148 |
<source_model>adminhtml/system_config_source_country</source_model>
|
| 149 |
<show_in_default>1</show_in_default>
|
| 150 |
<show_in_website>1</show_in_website>
|
|
@@ -153,14 +196,14 @@
|
|
| 153 |
<showmethod translate="label">
|
| 154 |
<label>Show method if not applicable</label>
|
| 155 |
<frontend_type>select</frontend_type>
|
| 156 |
-
<sort_order>
|
| 157 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 158 |
<show_in_default>1</show_in_default>
|
| 159 |
<show_in_website>1</show_in_website>
|
| 160 |
<show_in_store>1</show_in_store>
|
| 161 |
</showmethod>
|
| 162 |
<specificerrmsg translate="label">
|
| 163 |
-
<label>Displayed
|
| 164 |
<frontend_type>textarea</frontend_type>
|
| 165 |
<sort_order>80</sort_order>
|
| 166 |
<show_in_default>1</show_in_default>
|
| 38 |
<show_in_store>0</show_in_store>
|
| 39 |
<groups>
|
| 40 |
<matrixrate translate="label">
|
| 41 |
+
<label>Auctionmaid Matrix Rates</label>
|
| 42 |
<frontend_type>text</frontend_type>
|
| 43 |
<sort_order>2</sort_order>
|
| 44 |
<show_in_default>1</show_in_default>
|
| 46 |
<show_in_store>1</show_in_store>
|
| 47 |
<fields>
|
| 48 |
<handling_type translate="label">
|
| 49 |
+
<label>Calculate handling fee</label>
|
| 50 |
<frontend_type>select</frontend_type>
|
| 51 |
<source_model>shipping/source_handlingType</source_model>
|
| 52 |
+
<sort_order>80</sort_order>
|
| 53 |
<show_in_default>1</show_in_default>
|
| 54 |
<show_in_website>1</show_in_website>
|
| 55 |
<show_in_store>0</show_in_store>
|
| 56 |
</handling_type>
|
| 57 |
<handling_fee translate="label">
|
| 58 |
+
<label>Handling fee</label>
|
| 59 |
<frontend_type>text</frontend_type>
|
| 60 |
+
<sort_order>90</sort_order>
|
| 61 |
<show_in_default>1</show_in_default>
|
| 62 |
<show_in_website>1</show_in_website>
|
| 63 |
<show_in_store>1</show_in_store>
|
| 71 |
<show_in_website>1</show_in_website>
|
| 72 |
<show_in_store>1</show_in_store>
|
| 73 |
</active>
|
| 74 |
+
<allow_free_shipping_promotions translate="label">
|
| 75 |
+
<label>Free shipping promotions</label>
|
| 76 |
+
<frontend_type>select</frontend_type>
|
| 77 |
+
<source_model>adminhtml/system_config_source_enabledisable</source_model>
|
| 78 |
+
<sort_order>50</sort_order>
|
| 79 |
+
<show_in_default>1</show_in_default>
|
| 80 |
+
<show_in_website>1</show_in_website>
|
| 81 |
+
<show_in_store>1</show_in_store>
|
| 82 |
+
</allow_free_shipping_promotions>
|
| 83 |
+
<show_only_free translate="label">
|
| 84 |
+
<label>Only display free shipping</label>
|
| 85 |
+
<frontend_type>select</frontend_type>
|
| 86 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 87 |
+
<sort_order>51</sort_order>
|
| 88 |
+
<show_in_default>1</show_in_default>
|
| 89 |
+
<show_in_website>1</show_in_website>
|
| 90 |
+
<show_in_store>1</show_in_store>
|
| 91 |
+
</show_only_free>
|
| 92 |
+
<free_method_text translate="label">
|
| 93 |
+
<label>Free shipping display text</label>
|
| 94 |
+
<frontend_type>text</frontend_type>
|
| 95 |
+
<sort_order>52</sort_order>
|
| 96 |
+
<show_in_default>1</show_in_default>
|
| 97 |
+
<show_in_website>1</show_in_website>
|
| 98 |
+
<show_in_store>1</show_in_store>
|
| 99 |
+
</free_method_text>
|
| 100 |
+
<enable_free_shipping_threshold translate="label">
|
| 101 |
+
<label>Free shipping with minimum order amount</label>
|
| 102 |
+
<frontend_type>select</frontend_type>
|
| 103 |
+
<source_model>adminhtml/system_config_source_enabledisable</source_model>
|
| 104 |
+
<sort_order>53</sort_order>
|
| 105 |
+
<show_in_default>1</show_in_default>
|
| 106 |
+
<show_in_website>1</show_in_website>
|
| 107 |
+
<show_in_store>1</show_in_store>
|
| 108 |
+
</enable_free_shipping_threshold>
|
| 109 |
+
<free_shipping_threshold translate="label">
|
| 110 |
+
<label>Minimum order amount for free shipping</label>
|
| 111 |
+
<frontend_type>text</frontend_type>
|
| 112 |
+
<sort_order>54</sort_order>
|
| 113 |
+
<show_in_default>1</show_in_default>
|
| 114 |
+
<show_in_website>1</show_in_website>
|
| 115 |
+
<show_in_store>1</show_in_store>
|
| 116 |
+
</free_shipping_threshold>
|
| 117 |
<zip_range translate="label">
|
| 118 |
+
<label>Use zipcode to/from range</label>
|
| 119 |
<frontend_type>select</frontend_type>
|
| 120 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 121 |
+
<sort_order>60</sort_order>
|
| 122 |
<show_in_default>1</show_in_default>
|
| 123 |
<show_in_website>1</show_in_website>
|
| 124 |
<show_in_store>1</show_in_store>
|
| 145 |
<label>Import</label>
|
| 146 |
<frontend_type>import</frontend_type>
|
| 147 |
<backend_model>adminhtml/system_config_backend_shipping_matrixrate</backend_model>
|
| 148 |
+
<sort_order>70</sort_order>
|
| 149 |
<show_in_default>0</show_in_default>
|
| 150 |
<show_in_website>1</show_in_website>
|
| 151 |
<show_in_store>0</show_in_store>
|
| 161 |
<sort_order translate="label">
|
| 162 |
<label>Sort order</label>
|
| 163 |
<frontend_type>text</frontend_type>
|
| 164 |
+
<sort_order>200</sort_order>
|
| 165 |
<show_in_default>1</show_in_default>
|
| 166 |
<show_in_website>1</show_in_website>
|
| 167 |
<show_in_store>1</show_in_store>
|
| 177 |
<sallowspecific translate="label">
|
| 178 |
<label>Ship to applicable countries</label>
|
| 179 |
<frontend_type>select</frontend_type>
|
| 180 |
+
<sort_order>100</sort_order>
|
| 181 |
<frontend_class>shipping-applicable-country</frontend_class>
|
| 182 |
<source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
|
| 183 |
<show_in_default>1</show_in_default>
|
| 185 |
<show_in_store>1</show_in_store>
|
| 186 |
</sallowspecific>
|
| 187 |
<specificcountry translate="label">
|
| 188 |
+
<label>Ship to specific countries</label>
|
| 189 |
<frontend_type>multiselect</frontend_type>
|
| 190 |
+
<sort_order>110</sort_order>
|
| 191 |
<source_model>adminhtml/system_config_source_country</source_model>
|
| 192 |
<show_in_default>1</show_in_default>
|
| 193 |
<show_in_website>1</show_in_website>
|
| 196 |
<showmethod translate="label">
|
| 197 |
<label>Show method if not applicable</label>
|
| 198 |
<frontend_type>select</frontend_type>
|
| 199 |
+
<sort_order>120</sort_order>
|
| 200 |
<source_model>adminhtml/system_config_source_yesno</source_model>
|
| 201 |
<show_in_default>1</show_in_default>
|
| 202 |
<show_in_website>1</show_in_website>
|
| 203 |
<show_in_store>1</show_in_store>
|
| 204 |
</showmethod>
|
| 205 |
<specificerrmsg translate="label">
|
| 206 |
+
<label>Displayed error message</label>
|
| 207 |
<frontend_type>textarea</frontend_type>
|
| 208 |
<sort_order>80</sort_order>
|
| 209 |
<show_in_default>1</show_in_default>
|
app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-install-1.0.5.php
DELETED
|
@@ -1,42 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
$installer = $this;
|
| 4 |
-
|
| 5 |
-
$installer->startSetup();
|
| 6 |
-
|
| 7 |
-
$installer->run("
|
| 8 |
-
|
| 9 |
-
DROP TABLE IF EXISTS {$this->getTable('shipping_matrixrate')};
|
| 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(10) NOT NULL default '',
|
| 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 '',
|
| 19 |
-
condition_from_value decimal(12,4) NOT NULL default '0.0000',
|
| 20 |
-
condition_to_value decimal(12,4) NOT NULL default '0.0000',
|
| 21 |
-
price decimal(12,4) NOT NULL default '0.0000',
|
| 22 |
-
cost decimal(12,4) NOT NULL default '0.0000',
|
| 23 |
-
delivery_type varchar(30) NOT NULL default '',
|
| 24 |
-
PRIMARY KEY(`pk`),
|
| 25 |
-
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`)
|
| 26 |
-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 27 |
-
|
| 28 |
-
select @entity_type_id:=entity_type_id from {$this->getTable('eav_entity_type')}
|
| 29 |
-
where entity_type_code='catalog_product';
|
| 30 |
-
|
| 31 |
-
replace into {$this->getTable('eav_attribute')}
|
| 32 |
-
set entity_type_id = @entity_type_id,
|
| 33 |
-
attribute_code = 'exclude_free_shipping',
|
| 34 |
-
backend_type = 'int',
|
| 35 |
-
frontend_input = 'boolean',
|
| 36 |
-
frontend_label = 'Exclude product from Free Shipping';
|
| 37 |
-
|
| 38 |
-
");
|
| 39 |
-
|
| 40 |
-
$installer->endSetup();
|
| 41 |
-
|
| 42 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.0.php
DELETED
|
@@ -1,42 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
$installer = $this;
|
| 4 |
-
|
| 5 |
-
$installer->startSetup();
|
| 6 |
-
|
| 7 |
-
$installer->run("
|
| 8 |
-
|
| 9 |
-
DROP TABLE IF EXISTS {$this->getTable('shipping_matrixrate')};
|
| 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(10) NOT NULL default '',
|
| 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 '',
|
| 19 |
-
condition_from_value decimal(12,4) NOT NULL default '0.0000',
|
| 20 |
-
condition_to_value decimal(12,4) NOT NULL default '0.0000',
|
| 21 |
-
price decimal(12,4) NOT NULL default '0.0000',
|
| 22 |
-
cost decimal(12,4) NOT NULL default '0.0000',
|
| 23 |
-
delivery_type varchar(30) NOT NULL default '',
|
| 24 |
-
PRIMARY KEY(`pk`),
|
| 25 |
-
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`)
|
| 26 |
-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 27 |
-
|
| 28 |
-
select @entity_type_id:=entity_type_id from {$this->getTable('eav_entity_type')}
|
| 29 |
-
where entity_type_code='catalog_product';
|
| 30 |
-
|
| 31 |
-
replace into {$this->getTable('eav_attribute')}
|
| 32 |
-
set entity_type_id = @entity_type_id,
|
| 33 |
-
attribute_code = 'exclude_free_shipping',
|
| 34 |
-
backend_type = 'int',
|
| 35 |
-
frontend_input = 'boolean',
|
| 36 |
-
frontend_label = 'Exclude product from Free Shipping';
|
| 37 |
-
|
| 38 |
-
");
|
| 39 |
-
|
| 40 |
-
$installer->endSetup();
|
| 41 |
-
|
| 42 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-install-2.0.1.php
CHANGED
|
@@ -25,15 +25,7 @@ CREATE TABLE {$this->getTable('shipping_matrixrate')} (
|
|
| 25 |
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`)
|
| 26 |
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 27 |
|
| 28 |
-
|
| 29 |
-
where entity_type_code='catalog_product';
|
| 30 |
-
|
| 31 |
-
replace into {$this->getTable('eav_attribute')}
|
| 32 |
-
set entity_type_id = @entity_type_id,
|
| 33 |
-
attribute_code = 'exclude_free_shipping',
|
| 34 |
-
backend_type = 'int',
|
| 35 |
-
frontend_input = 'boolean',
|
| 36 |
-
frontend_label = 'Exclude product from Free Shipping';
|
| 37 |
|
| 38 |
");
|
| 39 |
|
| 25 |
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`)
|
| 26 |
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 27 |
|
| 28 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
|
| 30 |
");
|
| 31 |
|
app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-uninstall-2.0.0.php
DELETED
|
@@ -1,12 +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/matrixrate/%';
|
| 9 |
-
DELETE FROM {$this->getTable('eav_attribute')} WHERE attribute_code = 'exclude_free_shipping';
|
| 10 |
-
");
|
| 11 |
-
|
| 12 |
-
$installer->endSetup();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.0.php
DELETED
|
@@ -1,42 +0,0 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
$installer = $this;
|
| 4 |
-
|
| 5 |
-
$installer->startSetup();
|
| 6 |
-
|
| 7 |
-
$installer->run("
|
| 8 |
-
|
| 9 |
-
DROP TABLE IF EXISTS {$this->getTable('shipping_matrixrate')};
|
| 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(10) NOT NULL default '',
|
| 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 '',
|
| 19 |
-
condition_from_value decimal(12,4) NOT NULL default '0.0000',
|
| 20 |
-
condition_to_value decimal(12,4) NOT NULL default '0.0000',
|
| 21 |
-
price decimal(12,4) NOT NULL default '0.0000',
|
| 22 |
-
cost decimal(12,4) NOT NULL default '0.0000',
|
| 23 |
-
delivery_type varchar(30) NOT NULL default '',
|
| 24 |
-
PRIMARY KEY(`pk`),
|
| 25 |
-
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`)
|
| 26 |
-
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 27 |
-
|
| 28 |
-
select @entity_type_id:=entity_type_id from {$this->getTable('eav_entity_type')}
|
| 29 |
-
where entity_type_code='catalog_product';
|
| 30 |
-
|
| 31 |
-
replace into {$this->getTable('eav_attribute')}
|
| 32 |
-
set entity_type_id = @entity_type_id,
|
| 33 |
-
attribute_code = 'exclude_free_shipping',
|
| 34 |
-
backend_type = 'int',
|
| 35 |
-
frontend_input = 'boolean',
|
| 36 |
-
frontend_label = 'Exclude product from Free Shipping';
|
| 37 |
-
|
| 38 |
-
");
|
| 39 |
-
|
| 40 |
-
$installer->endSetup();
|
| 41 |
-
|
| 42 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Auctionmaid/Matrixrate/sql/matrixrate_setup/mysql4-upgrade-2.0.1.php
CHANGED
|
@@ -25,15 +25,7 @@ CREATE TABLE {$this->getTable('shipping_matrixrate')} (
|
|
| 25 |
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`)
|
| 26 |
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 27 |
|
| 28 |
-
|
| 29 |
-
where entity_type_code='catalog_product';
|
| 30 |
-
|
| 31 |
-
replace into {$this->getTable('eav_attribute')}
|
| 32 |
-
set entity_type_id = @entity_type_id,
|
| 33 |
-
attribute_code = 'exclude_free_shipping',
|
| 34 |
-
backend_type = 'int',
|
| 35 |
-
frontend_input = 'boolean',
|
| 36 |
-
frontend_label = 'Exclude product from Free Shipping';
|
| 37 |
|
| 38 |
");
|
| 39 |
|
| 25 |
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`)
|
| 26 |
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
| 27 |
|
| 28 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
|
| 30 |
");
|
| 31 |
|
app/code/community/Auctionmaid/docs/AuctionMaid MatrixRate Shipping Module.pdf
CHANGED
|
Binary file
|
app/code/community/Auctionmaid/docs/manual install.sql
CHANGED
|
@@ -16,12 +16,3 @@ CREATE TABLE shipping_matrixrate (
|
|
| 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 |
|
| 19 |
-
select @entity_type_id:=entity_type_id from eav_entity_type where entity_type_code='catalog_product';
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
replace into eav_attribute
|
| 23 |
-
set entity_type_id = @entity_type_id,
|
| 24 |
-
attribute_code = 'exclude_free_shipping',
|
| 25 |
-
backend_type = 'int',
|
| 26 |
-
frontend_input = 'boolean',
|
| 27 |
-
frontend_label = 'Exclude product from Free Shipping';
|
| 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 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/etc/modules/Auctionmaid_Freeoptionalshipping.xml
DELETED
|
@@ -1,9 +0,0 @@
|
|
| 1 |
-
<?xml version="1.0"?>
|
| 2 |
-
<config>
|
| 3 |
-
<modules>
|
| 4 |
-
<Auctionmaid_Freeoptionalshipping>
|
| 5 |
-
<active>true</active>
|
| 6 |
-
<codePool>community</codePool>
|
| 7 |
-
</Auctionmaid_Freeoptionalshipping>
|
| 8 |
-
</modules>
|
| 9 |
-
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Auctionmaid_Matrxrate</name>
|
| 4 |
-
<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>
|
|
@@ -16,13 +16,13 @@ Suitable for all countries incl UK, US, AUS, Europe.</summary>
|
|
| 16 |
- country, region, city, postcode filtering
|
| 17 |
- partial postcode filtering, including pattern matching
|
| 18 |
- numerical postcode ranges
|
| 19 |
-
-
|
| 20 |
-
-
|
| 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="
|
| 26 |
<compatible/>
|
| 27 |
<dependencies/>
|
| 28 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Auctionmaid_Matrxrate</name>
|
| 4 |
+
<version>3.0.1</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>
|
| 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-06-27</date>
|
| 24 |
+
<time>06:19:44</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="8747b3b977ca4a239f1921dcfb50ca63"/></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>
|
| 26 |
<compatible/>
|
| 27 |
<dependencies/>
|
| 28 |
</package>
|
