Auctionmaid_Matrxrate - Version 4.1.1

Version Notes

Added export facility only compatible with 1.4+

Download this release

Release Info

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


Code changes from version 4.1.0 to 4.1.1

Files changed (4) hide show
  1. app/code/community/Webshopapps/Matrixrate/Block/Adminhtml/Shipping/Carrier/Matrixrate/Grid.php +74 -1
  2. app/code/community/Webshopapps/Matrixrate/etc/system.xml +1 -0
  3. app/locale/en_US/Auctionmaid_Matrixrate.csv +0 -15
  4. package.xml +5 -5
app/code/community/Webshopapps/Matrixrate/Block/Adminhtml/Shipping/Carrier/Matrixrate/Grid.php CHANGED
@@ -1,7 +1,7 @@
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
  /**
@@ -76,5 +76,78 @@ class Webshopapps_Matrixrate_Block_Adminhtml_Shipping_Carrier_Matrixrate_Grid ex
76
 
77
  return Mage_Adminhtml_Block_Widget_Grid::_prepareCollection();
78
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
79
 
80
  }
1
  <?php
2
 
3
 
4
+ class Webshopapps_Matrixrate_Block_Adminhtml_Shipping_Carrier_Matrixrate_Grid extends Mage_Adminhtml_Block_Widget_Grid
5
  {
6
 
7
  /**
76
 
77
  return Mage_Adminhtml_Block_Widget_Grid::_prepareCollection();
78
  }
79
+
80
+ /**
81
+ * Website filter
82
+ *
83
+ * @var int
84
+ */
85
+ protected $_websiteId;
86
+
87
+ /**
88
+ * Condition filter
89
+ *
90
+ * @var string
91
+ */
92
+ protected $_conditionName;
93
+
94
+ /**
95
+ * Define grid properties
96
+ *
97
+ * @return void
98
+ */
99
+ public function __construct()
100
+ {
101
+ parent::__construct();
102
+ $this->setId('shippingTablerateGrid');
103
+ $this->_exportPageSize = 10000;
104
+ }
105
+
106
+ /**
107
+ * Set current website
108
+ *
109
+ * @param int $websiteId
110
+ * @return Mage_Adminhtml_Block_Shipping_Carrier_Tablerate_Grid
111
+ */
112
+ public function setWebsiteId($websiteId)
113
+ {
114
+ $this->_websiteId = Mage::app()->getWebsite($websiteId)->getId();
115
+ return $this;
116
+ }
117
+
118
+ /**
119
+ * Retrieve current website id
120
+ *
121
+ * @return int
122
+ */
123
+ public function getWebsiteId()
124
+ {
125
+ if (is_null($this->_websiteId)) {
126
+ $this->_websiteId = Mage::app()->getWebsite()->getId();
127
+ }
128
+ return $this->_websiteId;
129
+ }
130
+
131
+ /**
132
+ * Set current website
133
+ *
134
+ * @param int $websiteId
135
+ * @return Mage_Adminhtml_Block_Shipping_Carrier_Tablerate_Grid
136
+ */
137
+ public function setConditionName($name)
138
+ {
139
+ $this->_conditionName = $name;
140
+ return $this;
141
+ }
142
+
143
+ /**
144
+ * Retrieve current website id
145
+ *
146
+ * @return int
147
+ */
148
+ public function getConditionName()
149
+ {
150
+ return $this->_conditionName;
151
+ }
152
 
153
  }
app/code/community/Webshopapps/Matrixrate/etc/system.xml CHANGED
@@ -97,6 +97,7 @@
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>
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
+ <comment>Currently only compatible with 1.4* and above</comment>
101
  </export>
102
  <zip_range translate="label">
103
  <label>Use zipcode to/from range</label>
app/locale/en_US/Auctionmaid_Matrixrate.csv DELETED
@@ -1,15 +0,0 @@
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.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,11 +15,11 @@
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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Auctionmaid_Matrxrate</name>
4
+ <version>4.1.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>
15
  - numerical postcode ranges
16
  - option to exclude items from free shipping
17
  - collection only option</description>
18
+ <notes>Added export facility only compatible with 1.4+</notes>
19
  <authors><author><name>Karen Baker</name><user>auto-converted</user><email>sales@webshopapps.com</email></author></authors>
20
+ <date>2011-06-01</date>
21
+ <time>16:49:22</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="Block"><dir name="Adminhtml"><dir name="Shipping"><dir name="Carrier"><dir name="Matrixrate"><file name="Grid.php" hash="791db18cd9af2d9df91a5a70eb272611"/></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="a3b23ffa8d01b19f153f7745e6ace60b"/></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>