Auctionmaid_Matrxrate - Version 4.1.0

Version Notes

Added export facility

Download this release

Release Info

Developer Magento Core Team
Extension Auctionmaid_Matrxrate
Version 4.1.0
Comparing to
See all releases


Code changes from version 4.0.0 to 4.1.0

Files changed (11) hide show
  1. app/code/community/Webshopapps/Matrixrate/Block/Adminhtml/Shipping/Carrier/Matrixrate/Grid.php +80 -0
  2. app/code/community/Webshopapps/Matrixrate/Block/Adminhtml/System/Config/Form/Field/Exportmatrix.php +61 -0
  3. app/code/community/Webshopapps/Matrixrate/{Adminhtml/Model → Model/Adminhtml}/System/Config/Backend/Shipping/Matrixrate.php +1 -1
  4. app/code/community/Webshopapps/Matrixrate/{Adminhtml/Model → Model/Adminhtml}/System/Config/Source/Shipping/Matrixrate.php +1 -1
  5. app/code/community/Webshopapps/Matrixrate/Model/Carrier/Matrixrate.php +61 -31
  6. app/code/community/Webshopapps/Matrixrate/Model/Mysql4/Carrier/Matrixrate/Collection.php +0 -1
  7. app/code/community/Webshopapps/Matrixrate/controllers/System/ConfigController.php +59 -0
  8. app/code/community/Webshopapps/Matrixrate/etc/config.xml +23 -2
  9. app/code/community/Webshopapps/Matrixrate/etc/system.xml +92 -92
  10. app/locale/en_US/Auctionmaid_Matrixrate.csv +15 -0
  11. package.xml +5 -5
app/code/community/Webshopapps/Matrixrate/Block/Adminhtml/Shipping/Carrier/Matrixrate/Grid.php ADDED
@@ -0,0 +1,80 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+
4
+ class Webshopapps_Matrixrate_Block_Adminhtml_Shipping_Carrier_Matrixrate_Grid extends Mage_Adminhtml_Block_Shipping_Carrier_Tablerate_Grid
5
+ {
6
+
7
+ /**
8
+ * Prepare table columns
9
+ *
10
+ * @return Mage_Adminhtml_Block_Widget_Grid
11
+ */
12
+ protected function _prepareColumns()
13
+ {
14
+ $this->addColumn('dest_country', array(
15
+ 'header' => Mage::helper('adminhtml')->__('Country'),
16
+ 'index' => 'dest_country',
17
+ 'default' => '*',
18
+ ));
19
+
20
+ $this->addColumn('dest_region', array(
21
+ 'header' => Mage::helper('adminhtml')->__('Region/State'),
22
+ 'index' => 'dest_region',
23
+ 'default' => '*',
24
+ ));
25
+
26
+ $this->addColumn('dest_city', array(
27
+ 'header' => Mage::helper('adminhtml')->__('City'),
28
+ 'index' => 'dest_city',
29
+ 'default' => '*',
30
+ ));
31
+
32
+ $this->addColumn('dest_zip', array(
33
+ 'header' => Mage::helper('adminhtml')->__('Zip/Postal Code From'),
34
+ 'index' => 'dest_zip',
35
+ ));
36
+
37
+ $this->addColumn('dest_zip_to', array(
38
+ 'header' => Mage::helper('adminhtml')->__('Zip/Postal Code To'),
39
+ 'index' => 'dest_zip_to',
40
+ ));
41
+
42
+
43
+ $label = Mage::getSingleton('matrixrate/carrier_matrixrate')
44
+ ->getCode('condition_name_short', $this->getConditionName());
45
+
46
+ $this->addColumn('condition_from_value', array(
47
+ 'header' => $label.' From',
48
+ 'index' => 'condition_from_value',
49
+ ));
50
+
51
+ $this->addColumn('condition_to_value', array(
52
+ 'header' => $label.' To',
53
+ 'index' => 'condition_to_value',
54
+ ));
55
+
56
+ $this->addColumn('price', array(
57
+ 'header' => Mage::helper('adminhtml')->__('Shipping Price'),
58
+ 'index' => 'price',
59
+ ));
60
+
61
+ $this->addColumn('delivery_type', array(
62
+ 'header' => Mage::helper('adminhtml')->__('Delivery Type'),
63
+ 'index' => 'delivery_type',
64
+ ));
65
+
66
+ return Mage_Adminhtml_Block_Widget_Grid::_prepareColumns();
67
+ }
68
+
69
+ protected function _prepareCollection()
70
+ {
71
+ $collection = Mage::getResourceModel('matrixrate_shipping/carrier_matrixrate_collection');
72
+ $collection->setConditionFilter($this->getConditionName())
73
+ ->setWebsiteFilter($this->getWebsiteId());
74
+
75
+ $this->setCollection($collection);
76
+
77
+ return Mage_Adminhtml_Block_Widget_Grid::_prepareCollection();
78
+ }
79
+
80
+ }
app/code/community/Webshopapps/Matrixrate/Block/Adminhtml/System/Config/Form/Field/Exportmatrix.php ADDED
@@ -0,0 +1,61 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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_Adminhtml
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+
27
+ /**
28
+ * Export CSV button for shipping table rates
29
+ *
30
+ * @category Mage
31
+ * @package Mage_Adminhtml
32
+ * @author Magento Core Team <core@magentocommerce.com>
33
+ */
34
+ class Webshopapps_Matrixrate_Block_Adminhtml_System_Config_Form_Field_Exportmatrix extends Mage_Adminhtml_Block_System_Config_Form_Field
35
+
36
+ {
37
+
38
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
39
+ {
40
+ $this->setElement($element);
41
+
42
+ $buttonBlock = $this->getLayout()->createBlock('adminhtml/widget_button');
43
+
44
+ $params = array(
45
+ 'website' => $buttonBlock->getRequest()->getParam('website')
46
+ );
47
+
48
+ $data = array(
49
+ 'label' => Mage::helper('adminhtml')->__('Export CSV'),
50
+
51
+ 'onclick' => 'setLocation(\''.Mage::helper('adminhtml')->getUrl("*/*/exportmatrix", $params) . 'conditionName/\' + $(\'carriers_matrixrate_condition_name\').value + \'/matrixrate.csv\' )',
52
+ 'class' => '',
53
+ );
54
+
55
+ $html = $buttonBlock->setData($data)->toHtml();
56
+
57
+ return $html;
58
+ }
59
+
60
+
61
+ }
app/code/community/Webshopapps/Matrixrate/{Adminhtml/Model → Model/Adminhtml}/System/Config/Backend/Shipping/Matrixrate.php RENAMED
@@ -28,7 +28,7 @@
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
  {
28
  */
29
 
30
 
31
+ class Webshopapps_Matrixrate_Model_Adminhtml_System_Config_Backend_Shipping_Matrixrate extends Mage_Core_Model_Config_Data
32
  {
33
  public function _afterSave()
34
  {
app/code/community/Webshopapps/Matrixrate/{Adminhtml/Model → Model/Adminhtml}/System/Config/Source/Shipping/Matrixrate.php RENAMED
@@ -27,7 +27,7 @@
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
  {
27
  * @author Karen Baker <sales@webshopapps.com>
28
  */
29
 
30
+ class Webshopapps_Matrixrate_Model_Adminhtml_System_Config_Source_Shipping_Matrixrate
31
  {
32
  public function toOptionArray()
33
  {
app/code/community/Webshopapps/Matrixrate/Model/Carrier/Matrixrate.php CHANGED
@@ -56,35 +56,62 @@ class Webshopapps_Matrixrate_Model_Carrier_Matrixrate
56
  if (!$this->getConfigFlag('active')) {
57
  return false;
58
  }
59
-
60
- $freeBoxes = 0;
61
- $found=false;
62
- $virtualTotal=0;
63
- foreach ($request->getAllItems() as $item) {
64
- if ($item->getFreeShipping() && $item->getProductType()!= Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL
65
- && $item->getProductType() != 'downloadable') {
66
- $freeBoxes+=$item->getQty();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
67
  }
68
- if ($item->getProductType() == Mage_Catalog_Model_Product_Type::TYPE_VIRTUAL ||
69
- $item->getProductType() == 'downloadable') {
70
- $virtualTotal+= $item->getBaseRowTotal();
71
- $found=true;
72
- }
73
  }
74
- if ($found && $this->getConfigFlag('remove_virtual')) {
75
- $request->setPackageValue($request->getPackageValue()-$virtualTotal);
 
76
  }
77
- $this->setFreeBoxes($freeBoxes);
78
 
79
- $request->setConditionName($this->getConfigData('condition_name') ? $this->getConfigData('condition_name') : $this->_default_condition_name);
 
 
80
 
 
 
 
81
  $result = Mage::getModel('shipping/rate_result');
82
  $ratearray = $this->getRate($request);
83
 
84
  $freeShipping=false;
85
 
86
- if ($this->getConfigData('enable_free_shipping_threshold') &&
87
- $this->getConfigData('free_shipping_threshold')!='' &&
88
  $this->getConfigData('free_shipping_threshold')>0 &&
89
  $request->getPackageValue()>$this->getConfigData('free_shipping_threshold')) {
90
  $freeShipping=true;
@@ -139,6 +166,17 @@ class Webshopapps_Matrixrate_Model_Carrier_Matrixrate
139
  {
140
  return Mage::getResourceModel('matrixrate_shipping/carrier_matrixrate')->getNewRate($request,$this->getConfigFlag('zip_range'));
141
  }
 
 
 
 
 
 
 
 
 
 
 
142
 
143
  public function getCode($type, $code='')
144
  {
@@ -151,9 +189,9 @@ class Webshopapps_Matrixrate_Model_Carrier_Matrixrate
151
  ),
152
 
153
  'condition_name_short'=>array(
154
- 'package_weight' => Mage::helper('shipping')->__('Weight (and above)'),
155
- 'package_value' => Mage::helper('shipping')->__('Order Subtotal (and above)'),
156
- 'package_qty' => Mage::helper('shipping')->__('# of Items (and above)'),
157
  ),
158
 
159
  );
@@ -173,14 +211,6 @@ class Webshopapps_Matrixrate_Model_Carrier_Matrixrate
173
  return $codes[$type][$code];
174
  }
175
 
176
- /**
177
- * Get allowed shipping methods
178
- *
179
- * @return array
180
- */
181
- public function getAllowedMethods()
182
- {
183
- return array('matrixrate'=>$this->getConfigData('name'));
184
- }
185
 
186
  }
56
  if (!$this->getConfigFlag('active')) {
57
  return false;
58
  }
59
+
60
+ // exclude Virtual products price from Package value if pre-configured
61
+ if (!$this->getConfigFlag('include_virtual_price') && $request->getAllItems()) {
62
+ foreach ($request->getAllItems() as $item) {
63
+ if ($item->getParentItem()) {
64
+ continue;
65
+ }
66
+ if ($item->getHasChildren() && $item->isShipSeparately()) {
67
+ foreach ($item->getChildren() as $child) {
68
+ if ($child->getProduct()->isVirtual() || $item->getProductType() == 'downloadable') {
69
+ $request->setPackageValue($request->getPackageValue() - $child->getBaseRowTotal());
70
+ }
71
+ }
72
+ } elseif ($item->getProduct()->isVirtual() || $item->getProductType() == 'downloadable') {
73
+ $request->setPackageValue($request->getPackageValue() - $item->getBaseRowTotal());
74
+ }
75
+ }
76
+ }
77
+
78
+ // Free shipping by qty
79
+ $freeQty = 0;
80
+ if ($request->getAllItems()) {
81
+ foreach ($request->getAllItems() as $item) {
82
+ if ($item->getProduct()->isVirtual() || $item->getParentItem()) {
83
+ continue;
84
+ }
85
+
86
+ if ($item->getHasChildren() && $item->isShipSeparately()) {
87
+ foreach ($item->getChildren() as $child) {
88
+ if ($child->getFreeShipping() && !$child->getProduct()->isVirtual()) {
89
+ $freeQty += $item->getQty() * ($child->getQty() - (is_numeric($child->getFreeShipping()) ? $child->getFreeShipping() : 0));
90
+ }
91
+ }
92
+ } elseif ($item->getFreeShipping()) {
93
+ $freeQty += ($item->getQty() - (is_numeric($item->getFreeShipping()) ? $item->getFreeShipping() : 0));
94
+ }
95
  }
 
 
 
 
 
96
  }
97
+
98
+ if (!$request->getConditionName()) {
99
+ $request->setConditionName($this->getConfigData('condition_name') ? $this->getConfigData('condition_name') : $this->_default_condition_name);
100
  }
 
101
 
102
+ // Package weight and qty free shipping
103
+ $oldWeight = $request->getPackageWeight();
104
+ $oldQty = $request->getPackageQty();
105
 
106
+ $request->setPackageWeight($request->getFreeMethodWeight());
107
+ $request->setPackageQty($oldQty - $freeQty);
108
+
109
  $result = Mage::getModel('shipping/rate_result');
110
  $ratearray = $this->getRate($request);
111
 
112
  $freeShipping=false;
113
 
114
+ if (is_numeric($this->getConfigData('free_shipping_threshold')) &&
 
115
  $this->getConfigData('free_shipping_threshold')>0 &&
116
  $request->getPackageValue()>$this->getConfigData('free_shipping_threshold')) {
117
  $freeShipping=true;
166
  {
167
  return Mage::getResourceModel('matrixrate_shipping/carrier_matrixrate')->getNewRate($request,$this->getConfigFlag('zip_range'));
168
  }
169
+
170
+ /**
171
+ * Get allowed shipping methods
172
+ *
173
+ * @return array
174
+ */
175
+ public function getAllowedMethods()
176
+ {
177
+ return array('matrixrate'=>$this->getConfigData('name'));
178
+ }
179
+
180
 
181
  public function getCode($type, $code='')
182
  {
189
  ),
190
 
191
  'condition_name_short'=>array(
192
+ 'package_weight' => Mage::helper('shipping')->__('Weight'),
193
+ 'package_value' => Mage::helper('shipping')->__('Order Subtotal'),
194
+ 'package_qty' => Mage::helper('shipping')->__('# of Items'),
195
  ),
196
 
197
  );
211
  return $codes[$type][$code];
212
  }
213
 
214
+
 
 
 
 
 
 
 
 
215
 
216
  }
app/code/community/Webshopapps/Matrixrate/Model/Mysql4/Carrier/Matrixrate/Collection.php CHANGED
@@ -56,7 +56,6 @@ class Webshopapps_Matrixrate_Model_Mysql4_Carrier_Matrixrate_Collection extends
56
  public function setConditionFilter($conditionName)
57
  {
58
  $this->_select->where("condition_name = ?", $conditionName);
59
-
60
  return $this;
61
  }
62
 
56
  public function setConditionFilter($conditionName)
57
  {
58
  $this->_select->where("condition_name = ?", $conditionName);
 
59
  return $this;
60
  }
61
 
app/code/community/Webshopapps/Matrixrate/controllers/System/ConfigController.php ADDED
@@ -0,0 +1,59 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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_Adminhtml
23
+ * @copyright Copyright (c) 2010 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
25
+ */
26
+
27
+
28
+ /**
29
+ * config controller
30
+ *
31
+ * @category Mage
32
+ * @package Mage_Adminhtml
33
+ * @author Magento Core Team <core@magentocommerce.com>
34
+ */
35
+ class Webshopapps_Matrixrate_System_ConfigController extends Mage_Adminhtml_Controller_Action
36
+ {
37
+
38
+
39
+ /**
40
+ * Export shipping table rates in csv format
41
+ *
42
+ */
43
+ public function exportmatrixAction()
44
+ {
45
+ $fileName = 'matrixrates.csv';
46
+ /** @var $gridBlock Mage_Adminhtml_Block_Shipping_Carrier_Tablerate_Grid */
47
+ $gridBlock = $this->getLayout()->createBlock('matrixrate_adminhtml/shipping_carrier_matrixrate_grid');
48
+ $website = Mage::app()->getWebsite($this->getRequest()->getParam('website'));
49
+ if ($this->getRequest()->getParam('conditionName')) {
50
+ $conditionName = $this->getRequest()->getParam('conditionName');
51
+ } else {
52
+ $conditionName = $website->getConfig('carriers/matrixrate/condition_name');
53
+ }
54
+ $gridBlock->setWebsiteId($website->getId())->setConditionName($conditionName);
55
+ $content = $gridBlock->getCsvFile();
56
+ $this->_prepareDownloadResponse($fileName, $content);
57
+ }
58
+
59
+ }
app/code/community/Webshopapps/Matrixrate/etc/config.xml CHANGED
@@ -36,12 +36,22 @@
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>
@@ -103,6 +113,17 @@
103
  </modules>
104
  </translate>
105
  </frontend>
 
 
 
 
 
 
 
 
 
 
 
106
  <adminhtml>
107
  <translate>
108
 
@@ -120,7 +141,7 @@
120
  <matrixrate>
121
  <condition_name>package_weight</condition_name>
122
  <active>0</active>
123
- <remove_virtual>0</remove_virtual>
124
  <sallowspecific>0</sallowspecific>
125
  <allow_free_shipping_promotions>1</allow_free_shipping_promotions>
126
  <show_only_free>0</show_only_free>
36
  </Webshopapps_Matrixrate>
37
  </modules>
38
  <global>
39
+ <blocks>
40
+ <matrixrate_adminhtml>
41
+ <class>Webshopapps_Matrixrate_Block_Adminhtml</class>
42
+ </matrixrate_adminhtml>
43
+ </blocks>
44
+ <helpers>
45
+ <matrixrate>
46
+ <class>Webshopapps_Matrixrate_Helper</class>
47
+ </matrixrate>
48
+ </helpers>
49
  <models>
50
  <matrixrate>
51
  <class>Webshopapps_Matrixrate_Model</class>
52
  </matrixrate>
53
  <matrixrate_adminhtml>
54
+ <class>Webshopapps_Matrixrate_Model_Adminhtml</class>
55
  </matrixrate_adminhtml>
56
  <matrixrate_shipping>
57
  <class>Webshopapps_Matrixrate_Model</class>
113
  </modules>
114
  </translate>
115
  </frontend>
116
+ <admin>
117
+ <routers>
118
+ <adminhtml>
119
+ <args>
120
+ <modules>
121
+ <Webshopapps_Matrixrate before="Mage_Adminhtml">Webshopapps_Matrixrate</Webshopapps_Matrixrate>
122
+ </modules>
123
+ </args>
124
+ </adminhtml>
125
+ </routers>
126
+ </admin>
127
  <adminhtml>
128
  <translate>
129
 
141
  <matrixrate>
142
  <condition_name>package_weight</condition_name>
143
  <active>0</active>
144
+ <include_virtual_price>1</include_virtual_price>
145
  <sallowspecific>0</sallowspecific>
146
  <allow_free_shipping_promotions>1</allow_free_shipping_promotions>
147
  <show_only_free>0</show_only_free>
app/code/community/Webshopapps/Matrixrate/etc/system.xml CHANGED
@@ -51,37 +51,71 @@
51
  ]]>
52
  </comment>
53
  <fields>
54
- <handling_type translate="label">
55
- <label>Calculate handling fee</label>
56
  <frontend_type>select</frontend_type>
57
- <source_model>shipping/source_handlingType</source_model>
58
- <sort_order>80</sort_order>
59
  <show_in_default>1</show_in_default>
60
  <show_in_website>1</show_in_website>
61
- <show_in_store>0</show_in_store>
62
- </handling_type>
63
- <handling_fee translate="label">
64
- <label>Handling fee</label>
65
  <frontend_type>text</frontend_type>
66
- <sort_order>90</sort_order>
67
  <show_in_default>1</show_in_default>
68
  <show_in_website>1</show_in_website>
69
  <show_in_store>1</show_in_store>
70
- </handling_fee>
71
- <active translate="label">
72
- <label>Enabled</label>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
73
  <frontend_type>select</frontend_type>
74
  <source_model>adminhtml/system_config_source_yesno</source_model>
75
- <sort_order>1</sort_order>
76
  <show_in_default>1</show_in_default>
77
  <show_in_website>1</show_in_website>
78
  <show_in_store>1</show_in_store>
79
- </active>
80
- <allow_free_shipping_promotions translate="label">
 
81
  <label>Free shipping promotions</label>
82
  <frontend_type>select</frontend_type>
83
  <source_model>adminhtml/system_config_source_enabledisable</source_model>
84
- <sort_order>50</sort_order>
 
 
 
85
  <show_in_default>1</show_in_default>
86
  <show_in_website>1</show_in_website>
87
  <show_in_store>1</show_in_store>
@@ -90,7 +124,10 @@
90
  <label>Only display free shipping</label>
91
  <frontend_type>select</frontend_type>
92
  <source_model>adminhtml/system_config_source_yesno</source_model>
93
- <sort_order>51</sort_order>
 
 
 
94
  <show_in_default>1</show_in_default>
95
  <show_in_website>1</show_in_website>
96
  <show_in_store>1</show_in_store>
@@ -98,100 +135,55 @@
98
  <free_method_text translate="label">
99
  <label>Free shipping display text</label>
100
  <frontend_type>text</frontend_type>
101
- <sort_order>52</sort_order>
 
 
 
102
  <show_in_default>1</show_in_default>
103
  <show_in_website>1</show_in_website>
104
  <show_in_store>1</show_in_store>
105
  </free_method_text>
106
- <enable_free_shipping_threshold translate="label">
107
- <label>Free shipping with minimum order amount</label>
108
- <frontend_type>select</frontend_type>
109
- <source_model>adminhtml/system_config_source_enabledisable</source_model>
110
- <sort_order>53</sort_order>
111
- <show_in_default>1</show_in_default>
112
- <show_in_website>1</show_in_website>
113
- <show_in_store>1</show_in_store>
114
- </enable_free_shipping_threshold>
115
  <free_shipping_threshold translate="label">
116
  <label>Minimum order amount for free shipping</label>
117
  <frontend_type>text</frontend_type>
118
- <sort_order>54</sort_order>
 
 
 
119
  <show_in_default>1</show_in_default>
120
  <show_in_website>1</show_in_website>
121
  <show_in_store>1</show_in_store>
122
  </free_shipping_threshold>
123
- <zip_range translate="label">
124
- <label>Use zipcode to/from range</label>
125
- <frontend_type>select</frontend_type>
126
- <source_model>adminhtml/system_config_source_yesno</source_model>
127
- <sort_order>60</sort_order>
128
- <show_in_default>1</show_in_default>
129
- <show_in_website>1</show_in_website>
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>
137
- <show_in_default>1</show_in_default>
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>
165
- <show_in_store>0</show_in_store>
166
- </import>
167
- <name translate="label">
168
- <label>Method name</label>
169
- <frontend_type>text</frontend_type>
170
- <sort_order>3</sort_order>
171
- <show_in_default>1</show_in_default>
172
- <show_in_website>1</show_in_website>
173
- <show_in_store>1</show_in_store>
174
- </name>
175
- <sort_order translate="label">
176
- <label>Sort order</label>
177
- <frontend_type>text</frontend_type>
178
- <sort_order>200</sort_order>
179
  <show_in_default>1</show_in_default>
180
  <show_in_website>1</show_in_website>
181
- <show_in_store>1</show_in_store>
182
- </sort_order>
183
- <title translate="label">
184
- <label>Title</label>
185
  <frontend_type>text</frontend_type>
186
- <sort_order>2</sort_order>
187
  <show_in_default>1</show_in_default>
188
  <show_in_website>1</show_in_website>
189
  <show_in_store>1</show_in_store>
190
- </title>
191
  <sallowspecific translate="label">
192
  <label>Ship to applicable countries</label>
193
  <frontend_type>select</frontend_type>
194
- <sort_order>100</sort_order>
195
  <frontend_class>shipping-applicable-country</frontend_class>
196
  <source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
197
  <show_in_default>1</show_in_default>
@@ -201,7 +193,7 @@
201
  <specificcountry translate="label">
202
  <label>Ship to specific countries</label>
203
  <frontend_type>multiselect</frontend_type>
204
- <sort_order>110</sort_order>
205
  <source_model>adminhtml/system_config_source_country</source_model>
206
  <show_in_default>1</show_in_default>
207
  <show_in_website>1</show_in_website>
@@ -210,7 +202,7 @@
210
  <showmethod translate="label">
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>
@@ -220,11 +212,19 @@
220
  <specificerrmsg translate="label">
221
  <label>Displayed error message</label>
222
  <frontend_type>textarea</frontend_type>
223
- <sort_order>80</sort_order>
224
  <show_in_default>1</show_in_default>
225
  <show_in_website>1</show_in_website>
226
  <show_in_store>1</show_in_store>
227
  </specificerrmsg>
 
 
 
 
 
 
 
 
228
  </fields>
229
  </matrixrate>
230
  </groups>
51
  ]]>
52
  </comment>
53
  <fields>
54
+ <active translate="label">
55
+ <label>Enabled</label>
56
  <frontend_type>select</frontend_type>
57
+ <source_model>adminhtml/system_config_source_yesno</source_model>
58
+ <sort_order>10</sort_order>
59
  <show_in_default>1</show_in_default>
60
  <show_in_website>1</show_in_website>
61
+ <show_in_store>1</show_in_store>
62
+ </active>
63
+ <title translate="label">
64
+ <label>Title</label>
65
  <frontend_type>text</frontend_type>
66
+ <sort_order>20</sort_order>
67
  <show_in_default>1</show_in_default>
68
  <show_in_website>1</show_in_website>
69
  <show_in_store>1</show_in_store>
70
+ </title>
71
+ <condition_name translate="label">
72
+ <label>Condition</label>
73
+ <frontend_type>select</frontend_type>
74
+ <source_model>matrixrate_adminhtml/system_config_source_shipping_matrixrate</source_model>
75
+ <sort_order>30</sort_order>
76
+ <tooltip>
77
+ Once you change this and save you must re-import csv for it to take effect.
78
+ </tooltip>
79
+ <show_in_default>1</show_in_default>
80
+ <show_in_website>1</show_in_website>
81
+ <show_in_store>0</show_in_store>
82
+ <comment>Filter prices based on destination AND weight, price or quantity</comment>
83
+ </condition_name>
84
+ <import translate="label">
85
+ <label>Import</label>
86
+ <frontend_type>import</frontend_type>
87
+ <backend_model>matrixrate_adminhtml/system_config_backend_shipping_matrixrate</backend_model>
88
+ <sort_order>40</sort_order>
89
+ <show_in_default>0</show_in_default>
90
+ <show_in_website>1</show_in_website>
91
+ <show_in_store>0</show_in_store>
92
+ </import>
93
+ <export translate="label">
94
+ <label>Export</label>
95
+ <frontend_model>matrixrate_adminhtml/system_config_form_field_exportmatrix</frontend_model>
96
+ <sort_order>50</sort_order>
97
+ <show_in_default>0</show_in_default>
98
+ <show_in_website>1</show_in_website>
99
+ <show_in_store>0</show_in_store>
100
+ </export>
101
+ <zip_range translate="label">
102
+ <label>Use zipcode to/from range</label>
103
  <frontend_type>select</frontend_type>
104
  <source_model>adminhtml/system_config_source_yesno</source_model>
105
+ <sort_order>60</sort_order>
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
+ <comment>You should only set this to Yes if you use purely numeric zipcodes (e.g. USA/AUS clients)</comment>
110
+ </zip_range>
111
+ <allow_free_shipping_promotions translate="label">
112
  <label>Free shipping promotions</label>
113
  <frontend_type>select</frontend_type>
114
  <source_model>adminhtml/system_config_source_enabledisable</source_model>
115
+ <sort_order>70</sort_order>
116
+ <tooltip>
117
+ Allow free shipping promotions to apply to matrixrate
118
+ </tooltip>
119
  <show_in_default>1</show_in_default>
120
  <show_in_website>1</show_in_website>
121
  <show_in_store>1</show_in_store>
124
  <label>Only display free shipping</label>
125
  <frontend_type>select</frontend_type>
126
  <source_model>adminhtml/system_config_source_yesno</source_model>
127
+ <tooltip>
128
+ If free shipping applies dont show other shipping rates
129
+ </tooltip>
130
+ <sort_order>80</sort_order>
131
  <show_in_default>1</show_in_default>
132
  <show_in_website>1</show_in_website>
133
  <show_in_store>1</show_in_store>
135
  <free_method_text translate="label">
136
  <label>Free shipping display text</label>
137
  <frontend_type>text</frontend_type>
138
+ <sort_order>90</sort_order>
139
+ <tooltip>
140
+ What to show the shipping as when the price of shipping is 0. I.e "FREE SHIPPING"
141
+ </tooltip>
142
  <show_in_default>1</show_in_default>
143
  <show_in_website>1</show_in_website>
144
  <show_in_store>1</show_in_store>
145
  </free_method_text>
 
 
 
 
 
 
 
 
 
146
  <free_shipping_threshold translate="label">
147
  <label>Minimum order amount for free shipping</label>
148
  <frontend_type>text</frontend_type>
149
+ <sort_order>100</sort_order>
150
+ <tooltip>
151
+ Apply free shipping if this amount is exceeded
152
+ </tooltip>
153
  <show_in_default>1</show_in_default>
154
  <show_in_website>1</show_in_website>
155
  <show_in_store>1</show_in_store>
156
  </free_shipping_threshold>
157
+ <include_virtual_price translate="label">
158
+ <label>Include virtual products in price calculation</label>
159
+ <frontend_type>select</frontend_type>
160
+ <source_model>adminhtml/system_config_source_yesno</source_model>
161
+ <sort_order>110</sort_order>
162
+ <show_in_default>1</show_in_default>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
163
  <show_in_website>1</show_in_website>
164
  <show_in_store>0</show_in_store>
165
+ </include_virtual_price>
166
+ <handling_type translate="label">
167
+ <label>Calculate handling fee</label>
168
+ <frontend_type>select</frontend_type>
169
+ <source_model>shipping/source_handlingType</source_model>
170
+ <sort_order>120</sort_order>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
171
  <show_in_default>1</show_in_default>
172
  <show_in_website>1</show_in_website>
173
+ <show_in_store>0</show_in_store>
174
+ </handling_type>
175
+ <handling_fee translate="label">
176
+ <label>Handling fee</label>
177
  <frontend_type>text</frontend_type>
178
+ <sort_order>130</sort_order>
179
  <show_in_default>1</show_in_default>
180
  <show_in_website>1</show_in_website>
181
  <show_in_store>1</show_in_store>
182
+ </handling_fee>
183
  <sallowspecific translate="label">
184
  <label>Ship to applicable countries</label>
185
  <frontend_type>select</frontend_type>
186
+ <sort_order>200</sort_order>
187
  <frontend_class>shipping-applicable-country</frontend_class>
188
  <source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
189
  <show_in_default>1</show_in_default>
193
  <specificcountry translate="label">
194
  <label>Ship to specific countries</label>
195
  <frontend_type>multiselect</frontend_type>
196
+ <sort_order>210</sort_order>
197
  <source_model>adminhtml/system_config_source_country</source_model>
198
  <show_in_default>1</show_in_default>
199
  <show_in_website>1</show_in_website>
202
  <showmethod translate="label">
203
  <label>Show method if not applicable</label>
204
  <frontend_type>select</frontend_type>
205
+ <sort_order>320</sort_order>
206
  <frontend_class>shipping-skip-hide</frontend_class>
207
  <source_model>adminhtml/system_config_source_yesno</source_model>
208
  <show_in_default>1</show_in_default>
212
  <specificerrmsg translate="label">
213
  <label>Displayed error message</label>
214
  <frontend_type>textarea</frontend_type>
215
+ <sort_order>330</sort_order>
216
  <show_in_default>1</show_in_default>
217
  <show_in_website>1</show_in_website>
218
  <show_in_store>1</show_in_store>
219
  </specificerrmsg>
220
+ <sort_order translate="label">
221
+ <label>Sort order</label>
222
+ <frontend_type>text</frontend_type>
223
+ <sort_order>500</sort_order>
224
+ <show_in_default>1</show_in_default>
225
+ <show_in_website>1</show_in_website>
226
+ <show_in_store>1</show_in_store>
227
+ </sort_order>
228
  </fields>
229
  </matrixrate>
230
  </groups>
app/locale/en_US/Auctionmaid_Matrixrate.csv ADDED
@@ -0,0 +1,15 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ "Calculate Handling Fee","Calculate Handling Fee"
2
+ "Handling Fee","Handling Fee"
3
+ "Enabled","Enabled"
4
+ "Maximum Shipping Cost","Maximum Shipping Cost"
5
+ "Use Zipcode To/From Range","Use Zipcode To/From Range"
6
+ "Import","Import"
7
+ "Free Shipping Text","Free Shipping Text"
8
+ "Sort order","Sort order"
9
+ "Title","Title"
10
+ "Method name","Method name"
11
+ "Ship to applicable countries","Ship to applicable countries"
12
+ "Ship to Specific countries","Ship to Specific countries"
13
+ "Show method if not applicable","Show method if not applicable"
14
+ "Displayed Error Message","Displayed Error Message"
15
+ "Shipping Option","Shipping Option"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctionmaid_Matrxrate</name>
4
- <version>4.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>
@@ -15,11 +15,11 @@
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:27:31</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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctionmaid_Matrxrate</name>
4
+ <version>4.1.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>
15
  - numerical postcode ranges
16
  - option to exclude items from free shipping
17
  - collection only option</description>
18
+ <notes>Added export facility</notes>
19
  <authors><author><name>Karen Baker</name><user>auto-converted</user><email>sales@webshopapps.com</email></author></authors>
20
+ <date>2011-04-27</date>
21
+ <time>15:18:41</time>
22
+ <contents><target name="magelocale"><dir name="en_US"><file name="Auctionmaid_Matrixrate.csv" hash="d72e138554570b1f7d2dd3cec0ef7ce6"/></dir></target><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="Block"><dir name="Adminhtml"><dir name="Shipping"><dir name="Carrier"><dir name="Matrixrate"><file name="Grid.php" hash="50f8e38a0cbfb72543a15d84eb31e4b9"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Exportmatrix.php" hash="4ed1f6634f15727205da4e479e84bd91"/></dir></dir></dir></dir></dir></dir><dir name="controllers"><dir name="System"><file name="ConfigController.php" hash="5ee3cdd9ea3277607d7a17c327acc9e2"/></dir></dir><dir name="etc"><file name="config.xml" hash="6f5a54c8c08992183ffa01a721f6f6ea"/><file name="system.xml" hash="eb8bc57509351e366ce7843b958acb69"/></dir><dir name="Helper"><file name="Data.php" hash="97307283fd4c85ed72a699ab4be68661"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Shipping"><file name="Matrixrate.php" hash="d8b6999f8ad837a232ece7a69bc5893f"/></dir></dir><dir name="Source"><dir name="Shipping"><file name="Matrixrate.php" hash="f2914f0d8d36206646e7551ad69736fa"/></dir></dir></dir></dir></dir><dir name="Carrier"><file name="Matrixrate.php" hash="5963c14e89be89371b9ebb2565498268"/></dir><dir name="Mysql4"><dir name="Carrier"><file name="Matrixrate.php" hash="aa5b77ed44de4b973eecccadbe887232"/><dir name="Matrixrate"><file name="Collection.php" hash="7a4c5d64156700dc82799c5828e4f65c"/></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>