Minerva_Shipping - Version 1.3.1

Version Notes

Added ability to specify charge as "per item" or "per order" for each shipping option.

Download this release

Release Info

Developer Magento Core Team
Extension Minerva_Shipping
Version 1.3.1
Comparing to
See all releases


Code changes from version 1.3.0 to 1.3.1

Files changed (6) hide show
  1. app/code/community/Minerva/Shipping/Model/Carrier/Multiflat.php +7 -7
  2. app/code/community/Minerva/Shipping/etc/config.xml +2 -4
  3. app/code/community/Minerva/Shipping/etc/system.xml +196 -36
  4. app/design/frontend/default/minerva_default/template/checkout/cart/shipping.phtml +78 -53
  5. app/design/frontend/default/minerva_default/template/checkout/onepage/shipping_method/available.phtml +36 -27
  6. package.xml +7 -5
app/code/community/Minerva/Shipping/Model/Carrier/Multiflat.php CHANGED
@@ -37,13 +37,13 @@ class Minerva_Shipping_Model_Carrier_Multiflat extends Mage_Shipping_Model_Carri
37
  if (!$this->getConfigFlag('active')) {
38
  return false;
39
  }
40
- $result = Mage::getModel('shipping/rate_result');
 
41
  $packageValue = $request->getBaseCurrency()->convert($request->getPackageValue(), $request->getPackageCurrency());
42
- $allow = ($request->getmultiflat())
43
- || ($packageValue >= $this->getConfigData('free_shipping_subtotal'));
44
  for($i = 0; $i <= 10; $i++)
45
  {
46
- if ($this->getConfigData('type'.$i) == 'O') { // per order
 
47
  $shippingPrice = $this->getConfigData('price'.$i);
48
  } elseif ($this->getConfigData('type'.$i) == 'I') { // per item
49
  $shippingPrice = ($request->getPackageQty() * $this->getConfigData('price'.$i)) - ($this->getFreeBoxes() * $this->getConfigData('price'.$i));
@@ -52,7 +52,7 @@ class Minerva_Shipping_Model_Carrier_Multiflat extends Mage_Shipping_Model_Carri
52
  }
53
 
54
  $shippingName = $this->getConfigData('name'.$i);
55
- if($shippingName != "")
56
  {
57
  $method = Mage::getModel('shipping/rate_result_method');
58
  $method->setCarrier('msmultiflat');
@@ -69,7 +69,7 @@ class Minerva_Shipping_Model_Carrier_Multiflat extends Mage_Shipping_Model_Carri
69
  else if ($shippingName == "")
70
  {
71
  }
72
-
73
  }
74
 
75
  return $result;
@@ -77,7 +77,7 @@ class Minerva_Shipping_Model_Carrier_Multiflat extends Mage_Shipping_Model_Carri
77
 
78
  public function getAllowedMethods()
79
  {
80
- return array('msmultiflat'=>$this->getConfigData('name'));
81
  }
82
  }
83
  ?>
37
  if (!$this->getConfigFlag('active')) {
38
  return false;
39
  }
40
+ $allow = ($request->getmultiflat());
41
+ $result = Mage::getModel('shipping/rate_result');
42
  $packageValue = $request->getBaseCurrency()->convert($request->getPackageValue(), $request->getPackageCurrency());
 
 
43
  for($i = 0; $i <= 10; $i++)
44
  {
45
+
46
+ if ($this->getConfigData('type'.$i) == 'O') { // per order
47
  $shippingPrice = $this->getConfigData('price'.$i);
48
  } elseif ($this->getConfigData('type'.$i) == 'I') { // per item
49
  $shippingPrice = ($request->getPackageQty() * $this->getConfigData('price'.$i)) - ($this->getFreeBoxes() * $this->getConfigData('price'.$i));
52
  }
53
 
54
  $shippingName = $this->getConfigData('name'.$i);
55
+ if($shippingName != "" && ($packageValue >= $this->getConfigData('min_shipping'.$i) && $packageValue <= $this->getConfigData('max_shipping'.$i)) or $shippingName != "" && $this->getConfigData('max_shipping'.$i) == "")
56
  {
57
  $method = Mage::getModel('shipping/rate_result_method');
58
  $method->setCarrier('msmultiflat');
69
  else if ($shippingName == "")
70
  {
71
  }
72
+
73
  }
74
 
75
  return $result;
77
 
78
  public function getAllowedMethods()
79
  {
80
+ return array('msmultiflat'=>$this->getConfigData('name'));
81
  }
82
  }
83
  ?>
app/code/community/Minerva/Shipping/etc/config.xml CHANGED
@@ -10,16 +10,14 @@
10
  <title>No Charge</title>
11
  <type>I</type>
12
  <details>Enter pickup instructions here.</details>
13
- <specificerrmsg>This shipping method is currently unavailable.
14
- If you would like to ship using this shipping
15
- method, please contact us.</specificerrmsg>
16
  <handling_type>F</handling_type>
17
  </msmultiflat>
18
  </carriers>
19
  </default>
20
  <modules>
21
  <Minerva_Shipping>
22
- <version>1.2.0</version>
23
  </Minerva_Shipping>
24
  </modules>
25
  <global>
10
  <title>No Charge</title>
11
  <type>I</type>
12
  <details>Enter pickup instructions here.</details>
13
+ <specificerrmsg>This shipping method is currently unavailable. If you would like to ship using this shipping method, please contact us.</specificerrmsg>
 
 
14
  <handling_type>F</handling_type>
15
  </msmultiflat>
16
  </carriers>
17
  </default>
18
  <modules>
19
  <Minerva_Shipping>
20
+ <version>1.3.0</version>
21
  </Minerva_Shipping>
22
  </modules>
23
  <global>
app/code/community/Minerva/Shipping/etc/system.xml CHANGED
@@ -90,10 +90,26 @@
90
  <show_in_website>1</show_in_website>
91
  <show_in_store>0</show_in_store>
92
  </type1>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
93
  <name2 translate="label">
94
  <label>Event / Method 2 >></label>
95
  <frontend_type>text</frontend_type>
96
- <sort_order>8</sort_order>
97
  <show_in_default>1</show_in_default>
98
  <show_in_website>1</show_in_website>
99
  <show_in_store>1</show_in_store>
@@ -101,7 +117,7 @@
101
  <price2 translate="label">
102
  <label>• Price (0.00)</label>
103
  <frontend_type>text</frontend_type>
104
- <sort_order>9</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>
@@ -109,7 +125,7 @@
109
  <details2 translate="label">
110
  <label>• Details</label>
111
  <frontend_type>textarea</frontend_type>
112
- <sort_order>10</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>
@@ -118,15 +134,31 @@
118
  <label>• Type</label>
119
  <frontend_type>select</frontend_type>
120
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
121
- <sort_order>11</sort_order>
122
  <show_in_default>1</show_in_default>
123
  <show_in_website>1</show_in_website>
124
  <show_in_store>0</show_in_store>
125
  </type2>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
126
  <name3 translate="label">
127
  <label>Event / Method 3 >></label>
128
  <frontend_type>text</frontend_type>
129
- <sort_order>12</sort_order>
130
  <show_in_default>1</show_in_default>
131
  <show_in_website>1</show_in_website>
132
  <show_in_store>1</show_in_store>
@@ -134,7 +166,7 @@
134
  <price3 translate="label">
135
  <label>• Price (0.00)</label>
136
  <frontend_type>text</frontend_type>
137
- <sort_order>13</sort_order>
138
  <show_in_default>1</show_in_default>
139
  <show_in_website>1</show_in_website>
140
  <show_in_store>1</show_in_store>
@@ -142,7 +174,7 @@
142
  <details3 translate="label">
143
  <label>• Details</label>
144
  <frontend_type>textarea</frontend_type>
145
- <sort_order>14</sort_order>
146
  <show_in_default>1</show_in_default>
147
  <show_in_website>1</show_in_website>
148
  <show_in_store>1</show_in_store>
@@ -151,15 +183,31 @@
151
  <label>• Type</label>
152
  <frontend_type>select</frontend_type>
153
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
154
- <sort_order>15</sort_order>
155
  <show_in_default>1</show_in_default>
156
  <show_in_website>1</show_in_website>
157
  <show_in_store>0</show_in_store>
158
  </type3>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
159
  <name4 translate="label">
160
  <label>Event / Method 4 >></label>
161
  <frontend_type>text</frontend_type>
162
- <sort_order>16</sort_order>
163
  <show_in_default>1</show_in_default>
164
  <show_in_website>1</show_in_website>
165
  <show_in_store>1</show_in_store>
@@ -167,7 +215,7 @@
167
  <price4 translate="label">
168
  <label>• Price (0.00)</label>
169
  <frontend_type>text</frontend_type>
170
- <sort_order>17</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>
@@ -175,7 +223,7 @@
175
  <details4 translate="label">
176
  <label>• Details</label>
177
  <frontend_type>textarea</frontend_type>
178
- <sort_order>18</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>
@@ -184,15 +232,31 @@
184
  <label>• Type</label>
185
  <frontend_type>select</frontend_type>
186
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
187
- <sort_order>19</sort_order>
188
  <show_in_default>1</show_in_default>
189
  <show_in_website>1</show_in_website>
190
  <show_in_store>0</show_in_store>
191
  </type4>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
192
  <name5 translate="label">
193
  <label>Event / Method 5 >></label>
194
  <frontend_type>text</frontend_type>
195
- <sort_order>20</sort_order>
196
  <show_in_default>1</show_in_default>
197
  <show_in_website>1</show_in_website>
198
  <show_in_store>1</show_in_store>
@@ -200,7 +264,7 @@
200
  <price5 translate="label">
201
  <label>• Price (0.00)</label>
202
  <frontend_type>text</frontend_type>
203
- <sort_order>21</sort_order>
204
  <show_in_default>1</show_in_default>
205
  <show_in_website>1</show_in_website>
206
  <show_in_store>1</show_in_store>
@@ -208,7 +272,7 @@
208
  <details5 translate="label">
209
  <label>• Details</label>
210
  <frontend_type>textarea</frontend_type>
211
- <sort_order>22</sort_order>
212
  <show_in_default>1</show_in_default>
213
  <show_in_website>1</show_in_website>
214
  <show_in_store>1</show_in_store>
@@ -217,15 +281,31 @@
217
  <label>• Type</label>
218
  <frontend_type>select</frontend_type>
219
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
220
- <sort_order>23</sort_order>
221
  <show_in_default>1</show_in_default>
222
  <show_in_website>1</show_in_website>
223
  <show_in_store>0</show_in_store>
224
  </type5>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
225
  <name6 translate="label">
226
  <label>Event / Method 6 >></label>
227
  <frontend_type>text</frontend_type>
228
- <sort_order>24</sort_order>
229
  <show_in_default>1</show_in_default>
230
  <show_in_website>1</show_in_website>
231
  <show_in_store>1</show_in_store>
@@ -233,7 +313,7 @@
233
  <price6 translate="label">
234
  <label>• Price (0.00)</label>
235
  <frontend_type>text</frontend_type>
236
- <sort_order>25</sort_order>
237
  <show_in_default>1</show_in_default>
238
  <show_in_website>1</show_in_website>
239
  <show_in_store>1</show_in_store>
@@ -241,7 +321,7 @@
241
  <details6 translate="label">
242
  <label>• Details</label>
243
  <frontend_type>textarea</frontend_type>
244
- <sort_order>26</sort_order>
245
  <show_in_default>1</show_in_default>
246
  <show_in_website>1</show_in_website>
247
  <show_in_store>1</show_in_store>
@@ -250,15 +330,31 @@
250
  <label>• Type</label>
251
  <frontend_type>select</frontend_type>
252
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
253
- <sort_order>27</sort_order>
254
  <show_in_default>1</show_in_default>
255
  <show_in_website>1</show_in_website>
256
  <show_in_store>0</show_in_store>
257
  </type6>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
258
  <name7 translate="label">
259
  <label>Event / Method 7 >></label>
260
  <frontend_type>text</frontend_type>
261
- <sort_order>28</sort_order>
262
  <show_in_default>1</show_in_default>
263
  <show_in_website>1</show_in_website>
264
  <show_in_store>1</show_in_store>
@@ -266,7 +362,7 @@
266
  <price7 translate="label">
267
  <label>• Price (0.00)</label>
268
  <frontend_type>text</frontend_type>
269
- <sort_order>29</sort_order>
270
  <show_in_default>1</show_in_default>
271
  <show_in_website>1</show_in_website>
272
  <show_in_store>1</show_in_store>
@@ -274,7 +370,7 @@
274
  <details7 translate="label">
275
  <label>• Details</label>
276
  <frontend_type>textarea</frontend_type>
277
- <sort_order>30</sort_order>
278
  <show_in_default>1</show_in_default>
279
  <show_in_website>1</show_in_website>
280
  <show_in_store>1</show_in_store>
@@ -283,15 +379,31 @@
283
  <label>• Type</label>
284
  <frontend_type>select</frontend_type>
285
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
286
- <sort_order>31</sort_order>
287
  <show_in_default>1</show_in_default>
288
  <show_in_website>1</show_in_website>
289
  <show_in_store>0</show_in_store>
290
  </type7>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
291
  <name8 translate="label">
292
  <label>Event / Method 8 >></label>
293
  <frontend_type>text</frontend_type>
294
- <sort_order>32</sort_order>
295
  <show_in_default>1</show_in_default>
296
  <show_in_website>1</show_in_website>
297
  <show_in_store>1</show_in_store>
@@ -299,7 +411,7 @@
299
  <price8 translate="label">
300
  <label>• Price (0.00)</label>
301
  <frontend_type>text</frontend_type>
302
- <sort_order>33</sort_order>
303
  <show_in_default>1</show_in_default>
304
  <show_in_website>1</show_in_website>
305
  <show_in_store>1</show_in_store>
@@ -307,7 +419,7 @@
307
  <details8 translate="label">
308
  <label>• Details</label>
309
  <frontend_type>textarea</frontend_type>
310
- <sort_order>34</sort_order>
311
  <show_in_default>1</show_in_default>
312
  <show_in_website>1</show_in_website>
313
  <show_in_store>1</show_in_store>
@@ -316,15 +428,31 @@
316
  <label>• Type</label>
317
  <frontend_type>select</frontend_type>
318
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
319
- <sort_order>35</sort_order>
320
  <show_in_default>1</show_in_default>
321
  <show_in_website>1</show_in_website>
322
  <show_in_store>0</show_in_store>
323
  </type8>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
324
  <name9 translate="label">
325
  <label>Event / Method 9 >></label>
326
  <frontend_type>text</frontend_type>
327
- <sort_order>36</sort_order>
328
  <show_in_default>1</show_in_default>
329
  <show_in_website>1</show_in_website>
330
  <show_in_store>1</show_in_store>
@@ -332,7 +460,7 @@
332
  <price9 translate="label">
333
  <label>• Price (0.00)</label>
334
  <frontend_type>text</frontend_type>
335
- <sort_order>37</sort_order>
336
  <show_in_default>1</show_in_default>
337
  <show_in_website>1</show_in_website>
338
  <show_in_store>1</show_in_store>
@@ -340,7 +468,7 @@
340
  <details9 translate="label">
341
  <label>• Details</label>
342
  <frontend_type>textarea</frontend_type>
343
- <sort_order>38</sort_order>
344
  <show_in_default>1</show_in_default>
345
  <show_in_website>1</show_in_website>
346
  <show_in_store>1</show_in_store>
@@ -349,15 +477,31 @@
349
  <label>• Type</label>
350
  <frontend_type>select</frontend_type>
351
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
352
- <sort_order>39</sort_order>
353
  <show_in_default>1</show_in_default>
354
  <show_in_website>1</show_in_website>
355
  <show_in_store>0</show_in_store>
356
  </type9>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
357
  <name10 translate="label">
358
  <label>Event / Method 10 >></label>
359
  <frontend_type>text</frontend_type>
360
- <sort_order>40</sort_order>
361
  <show_in_default>1</show_in_default>
362
  <show_in_website>1</show_in_website>
363
  <show_in_store>1</show_in_store>
@@ -365,7 +509,7 @@
365
  <price10 translate="label">
366
  <label>• Price (0.00)</label>
367
  <frontend_type>text</frontend_type>
368
- <sort_order>41</sort_order>
369
  <show_in_default>1</show_in_default>
370
  <show_in_website>1</show_in_website>
371
  <show_in_store>1</show_in_store>
@@ -373,7 +517,7 @@
373
  <details10 translate="label">
374
  <label>• Details</label>
375
  <frontend_type>textarea</frontend_type>
376
- <sort_order>42</sort_order>
377
  <show_in_default>1</show_in_default>
378
  <show_in_website>1</show_in_website>
379
  <show_in_store>1</show_in_store>
@@ -382,11 +526,27 @@
382
  <label>• Type</label>
383
  <frontend_type>select</frontend_type>
384
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
385
- <sort_order>43</sort_order>
386
  <show_in_default>1</show_in_default>
387
  <show_in_website>1</show_in_website>
388
  <show_in_store>0</show_in_store>
389
  </type10>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
390
  <sallowspecific translate="label">
391
  <label>Ship to applicable countries</label>
392
  <frontend_type>select</frontend_type>
90
  <show_in_website>1</show_in_website>
91
  <show_in_store>0</show_in_store>
92
  </type1>
93
+ <min_shipping1 translate="label">
94
+ <label>• Minimum order amount</label>
95
+ <frontend_type>text</frontend_type>
96
+ <sort_order>8</sort_order>
97
+ <show_in_default>1</show_in_default>
98
+ <show_in_website>1</show_in_website>
99
+ <show_in_store>0</show_in_store>
100
+ </min_shipping1>
101
+ <max_shipping1 translate="label">
102
+ <label>• Maximum order amount</label>
103
+ <frontend_type>text</frontend_type>
104
+ <sort_order>9</sort_order>
105
+ <show_in_default>1</show_in_default>
106
+ <show_in_website>1</show_in_website>
107
+ <show_in_store>0</show_in_store>
108
+ </max_shipping1>
109
  <name2 translate="label">
110
  <label>Event / Method 2 >></label>
111
  <frontend_type>text</frontend_type>
112
+ <sort_order>10</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>
117
  <price2 translate="label">
118
  <label>• Price (0.00)</label>
119
  <frontend_type>text</frontend_type>
120
+ <sort_order>11</sort_order>
121
  <show_in_default>1</show_in_default>
122
  <show_in_website>1</show_in_website>
123
  <show_in_store>1</show_in_store>
125
  <details2 translate="label">
126
  <label>• Details</label>
127
  <frontend_type>textarea</frontend_type>
128
+ <sort_order>12</sort_order>
129
  <show_in_default>1</show_in_default>
130
  <show_in_website>1</show_in_website>
131
  <show_in_store>1</show_in_store>
134
  <label>• Type</label>
135
  <frontend_type>select</frontend_type>
136
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
137
+ <sort_order>13</sort_order>
138
  <show_in_default>1</show_in_default>
139
  <show_in_website>1</show_in_website>
140
  <show_in_store>0</show_in_store>
141
  </type2>
142
+ <min_shipping2 translate="label">
143
+ <label>• Minimum order amount</label>
144
+ <frontend_type>text</frontend_type>
145
+ <sort_order>14</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
+ </min_shipping2>
150
+ <max_shipping2 translate="label">
151
+ <label>• Maximum order amount</label>
152
+ <frontend_type>text</frontend_type>
153
+ <sort_order>15</sort_order>
154
+ <show_in_default>1</show_in_default>
155
+ <show_in_website>1</show_in_website>
156
+ <show_in_store>0</show_in_store>
157
+ </max_shipping2>
158
  <name3 translate="label">
159
  <label>Event / Method 3 >></label>
160
  <frontend_type>text</frontend_type>
161
+ <sort_order>16</sort_order>
162
  <show_in_default>1</show_in_default>
163
  <show_in_website>1</show_in_website>
164
  <show_in_store>1</show_in_store>
166
  <price3 translate="label">
167
  <label>• Price (0.00)</label>
168
  <frontend_type>text</frontend_type>
169
+ <sort_order>17</sort_order>
170
  <show_in_default>1</show_in_default>
171
  <show_in_website>1</show_in_website>
172
  <show_in_store>1</show_in_store>
174
  <details3 translate="label">
175
  <label>• Details</label>
176
  <frontend_type>textarea</frontend_type>
177
+ <sort_order>18</sort_order>
178
  <show_in_default>1</show_in_default>
179
  <show_in_website>1</show_in_website>
180
  <show_in_store>1</show_in_store>
183
  <label>• Type</label>
184
  <frontend_type>select</frontend_type>
185
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
186
+ <sort_order>19</sort_order>
187
  <show_in_default>1</show_in_default>
188
  <show_in_website>1</show_in_website>
189
  <show_in_store>0</show_in_store>
190
  </type3>
191
+ <min_shipping3 translate="label">
192
+ <label>• Minimum order amount</label>
193
+ <frontend_type>text</frontend_type>
194
+ <sort_order>20</sort_order>
195
+ <show_in_default>1</show_in_default>
196
+ <show_in_website>1</show_in_website>
197
+ <show_in_store>0</show_in_store>
198
+ </min_shipping3>
199
+ <max_shipping3 translate="label">
200
+ <label>• Maximum order amount</label>
201
+ <frontend_type>text</frontend_type>
202
+ <sort_order>21</sort_order>
203
+ <show_in_default>1</show_in_default>
204
+ <show_in_website>1</show_in_website>
205
+ <show_in_store>0</show_in_store>
206
+ </max_shipping3>
207
  <name4 translate="label">
208
  <label>Event / Method 4 >></label>
209
  <frontend_type>text</frontend_type>
210
+ <sort_order>22</sort_order>
211
  <show_in_default>1</show_in_default>
212
  <show_in_website>1</show_in_website>
213
  <show_in_store>1</show_in_store>
215
  <price4 translate="label">
216
  <label>• Price (0.00)</label>
217
  <frontend_type>text</frontend_type>
218
+ <sort_order>23</sort_order>
219
  <show_in_default>1</show_in_default>
220
  <show_in_website>1</show_in_website>
221
  <show_in_store>1</show_in_store>
223
  <details4 translate="label">
224
  <label>• Details</label>
225
  <frontend_type>textarea</frontend_type>
226
+ <sort_order>24</sort_order>
227
  <show_in_default>1</show_in_default>
228
  <show_in_website>1</show_in_website>
229
  <show_in_store>1</show_in_store>
232
  <label>• Type</label>
233
  <frontend_type>select</frontend_type>
234
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
235
+ <sort_order>25</sort_order>
236
  <show_in_default>1</show_in_default>
237
  <show_in_website>1</show_in_website>
238
  <show_in_store>0</show_in_store>
239
  </type4>
240
+ <min_shipping4 translate="label">
241
+ <label>• Minimum order amount</label>
242
+ <frontend_type>text</frontend_type>
243
+ <sort_order>26</sort_order>
244
+ <show_in_default>1</show_in_default>
245
+ <show_in_website>1</show_in_website>
246
+ <show_in_store>0</show_in_store>
247
+ </min_shipping4>
248
+ <max_shipping4 translate="label">
249
+ <label>• Maximum order amount</label>
250
+ <frontend_type>text</frontend_type>
251
+ <sort_order>27</sort_order>
252
+ <show_in_default>1</show_in_default>
253
+ <show_in_website>1</show_in_website>
254
+ <show_in_store>0</show_in_store>
255
+ </max_shipping4>
256
  <name5 translate="label">
257
  <label>Event / Method 5 >></label>
258
  <frontend_type>text</frontend_type>
259
+ <sort_order>28</sort_order>
260
  <show_in_default>1</show_in_default>
261
  <show_in_website>1</show_in_website>
262
  <show_in_store>1</show_in_store>
264
  <price5 translate="label">
265
  <label>• Price (0.00)</label>
266
  <frontend_type>text</frontend_type>
267
+ <sort_order>29</sort_order>
268
  <show_in_default>1</show_in_default>
269
  <show_in_website>1</show_in_website>
270
  <show_in_store>1</show_in_store>
272
  <details5 translate="label">
273
  <label>• Details</label>
274
  <frontend_type>textarea</frontend_type>
275
+ <sort_order>30</sort_order>
276
  <show_in_default>1</show_in_default>
277
  <show_in_website>1</show_in_website>
278
  <show_in_store>1</show_in_store>
281
  <label>• Type</label>
282
  <frontend_type>select</frontend_type>
283
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
284
+ <sort_order>31</sort_order>
285
  <show_in_default>1</show_in_default>
286
  <show_in_website>1</show_in_website>
287
  <show_in_store>0</show_in_store>
288
  </type5>
289
+ <min_shipping5 translate="label">
290
+ <label>• Minimum order amount</label>
291
+ <frontend_type>text</frontend_type>
292
+ <sort_order>32</sort_order>
293
+ <show_in_default>1</show_in_default>
294
+ <show_in_website>1</show_in_website>
295
+ <show_in_store>0</show_in_store>
296
+ </min_shipping5>
297
+ <max_shipping5 translate="label">
298
+ <label>• Maximum order amount</label>
299
+ <frontend_type>text</frontend_type>
300
+ <sort_order>33</sort_order>
301
+ <show_in_default>1</show_in_default>
302
+ <show_in_website>1</show_in_website>
303
+ <show_in_store>0</show_in_store>
304
+ </max_shipping5>
305
  <name6 translate="label">
306
  <label>Event / Method 6 >></label>
307
  <frontend_type>text</frontend_type>
308
+ <sort_order>34</sort_order>
309
  <show_in_default>1</show_in_default>
310
  <show_in_website>1</show_in_website>
311
  <show_in_store>1</show_in_store>
313
  <price6 translate="label">
314
  <label>• Price (0.00)</label>
315
  <frontend_type>text</frontend_type>
316
+ <sort_order>36</sort_order>
317
  <show_in_default>1</show_in_default>
318
  <show_in_website>1</show_in_website>
319
  <show_in_store>1</show_in_store>
321
  <details6 translate="label">
322
  <label>• Details</label>
323
  <frontend_type>textarea</frontend_type>
324
+ <sort_order>37</sort_order>
325
  <show_in_default>1</show_in_default>
326
  <show_in_website>1</show_in_website>
327
  <show_in_store>1</show_in_store>
330
  <label>• Type</label>
331
  <frontend_type>select</frontend_type>
332
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
333
+ <sort_order>38</sort_order>
334
  <show_in_default>1</show_in_default>
335
  <show_in_website>1</show_in_website>
336
  <show_in_store>0</show_in_store>
337
  </type6>
338
+ <min_shipping6 translate="label">
339
+ <label>• Minimum order amount</label>
340
+ <frontend_type>text</frontend_type>
341
+ <sort_order>39</sort_order>
342
+ <show_in_default>1</show_in_default>
343
+ <show_in_website>1</show_in_website>
344
+ <show_in_store>0</show_in_store>
345
+ </min_shipping6>
346
+ <max_shipping6 translate="label">
347
+ <label>• Maximum order amount</label>
348
+ <frontend_type>text</frontend_type>
349
+ <sort_order>40</sort_order>
350
+ <show_in_default>1</show_in_default>
351
+ <show_in_website>1</show_in_website>
352
+ <show_in_store>0</show_in_store>
353
+ </max_shipping6>
354
  <name7 translate="label">
355
  <label>Event / Method 7 >></label>
356
  <frontend_type>text</frontend_type>
357
+ <sort_order>41</sort_order>
358
  <show_in_default>1</show_in_default>
359
  <show_in_website>1</show_in_website>
360
  <show_in_store>1</show_in_store>
362
  <price7 translate="label">
363
  <label>• Price (0.00)</label>
364
  <frontend_type>text</frontend_type>
365
+ <sort_order>42</sort_order>
366
  <show_in_default>1</show_in_default>
367
  <show_in_website>1</show_in_website>
368
  <show_in_store>1</show_in_store>
370
  <details7 translate="label">
371
  <label>• Details</label>
372
  <frontend_type>textarea</frontend_type>
373
+ <sort_order>43</sort_order>
374
  <show_in_default>1</show_in_default>
375
  <show_in_website>1</show_in_website>
376
  <show_in_store>1</show_in_store>
379
  <label>• Type</label>
380
  <frontend_type>select</frontend_type>
381
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
382
+ <sort_order>44</sort_order>
383
  <show_in_default>1</show_in_default>
384
  <show_in_website>1</show_in_website>
385
  <show_in_store>0</show_in_store>
386
  </type7>
387
+ <min_shipping7 translate="label">
388
+ <label>• Minimum order amount</label>
389
+ <frontend_type>text</frontend_type>
390
+ <sort_order>45</sort_order>
391
+ <show_in_default>1</show_in_default>
392
+ <show_in_website>1</show_in_website>
393
+ <show_in_store>0</show_in_store>
394
+ </min_shipping7>
395
+ <max_shipping7 translate="label">
396
+ <label>• Maximum order amount</label>
397
+ <frontend_type>text</frontend_type>
398
+ <sort_order>46</sort_order>
399
+ <show_in_default>1</show_in_default>
400
+ <show_in_website>1</show_in_website>
401
+ <show_in_store>0</show_in_store>
402
+ </max_shipping7>
403
  <name8 translate="label">
404
  <label>Event / Method 8 >></label>
405
  <frontend_type>text</frontend_type>
406
+ <sort_order>47</sort_order>
407
  <show_in_default>1</show_in_default>
408
  <show_in_website>1</show_in_website>
409
  <show_in_store>1</show_in_store>
411
  <price8 translate="label">
412
  <label>• Price (0.00)</label>
413
  <frontend_type>text</frontend_type>
414
+ <sort_order>48</sort_order>
415
  <show_in_default>1</show_in_default>
416
  <show_in_website>1</show_in_website>
417
  <show_in_store>1</show_in_store>
419
  <details8 translate="label">
420
  <label>• Details</label>
421
  <frontend_type>textarea</frontend_type>
422
+ <sort_order>49</sort_order>
423
  <show_in_default>1</show_in_default>
424
  <show_in_website>1</show_in_website>
425
  <show_in_store>1</show_in_store>
428
  <label>• Type</label>
429
  <frontend_type>select</frontend_type>
430
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
431
+ <sort_order>50</sort_order>
432
  <show_in_default>1</show_in_default>
433
  <show_in_website>1</show_in_website>
434
  <show_in_store>0</show_in_store>
435
  </type8>
436
+ <min_shipping8 translate="label">
437
+ <label>• Minimum order amount</label>
438
+ <frontend_type>text</frontend_type>
439
+ <sort_order>51</sort_order>
440
+ <show_in_default>1</show_in_default>
441
+ <show_in_website>1</show_in_website>
442
+ <show_in_store>0</show_in_store>
443
+ </min_shipping8>
444
+ <max_shipping8 translate="label">
445
+ <label>• Maximum order amount</label>
446
+ <frontend_type>text</frontend_type>
447
+ <sort_order>52</sort_order>
448
+ <show_in_default>1</show_in_default>
449
+ <show_in_website>1</show_in_website>
450
+ <show_in_store>0</show_in_store>
451
+ </max_shipping8>
452
  <name9 translate="label">
453
  <label>Event / Method 9 >></label>
454
  <frontend_type>text</frontend_type>
455
+ <sort_order>53</sort_order>
456
  <show_in_default>1</show_in_default>
457
  <show_in_website>1</show_in_website>
458
  <show_in_store>1</show_in_store>
460
  <price9 translate="label">
461
  <label>• Price (0.00)</label>
462
  <frontend_type>text</frontend_type>
463
+ <sort_order>54</sort_order>
464
  <show_in_default>1</show_in_default>
465
  <show_in_website>1</show_in_website>
466
  <show_in_store>1</show_in_store>
468
  <details9 translate="label">
469
  <label>• Details</label>
470
  <frontend_type>textarea</frontend_type>
471
+ <sort_order>55</sort_order>
472
  <show_in_default>1</show_in_default>
473
  <show_in_website>1</show_in_website>
474
  <show_in_store>1</show_in_store>
477
  <label>• Type</label>
478
  <frontend_type>select</frontend_type>
479
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
480
+ <sort_order>56</sort_order>
481
  <show_in_default>1</show_in_default>
482
  <show_in_website>1</show_in_website>
483
  <show_in_store>0</show_in_store>
484
  </type9>
485
+ <min_shipping9 translate="label">
486
+ <label>• Minimum order amount</label>
487
+ <frontend_type>text</frontend_type>
488
+ <sort_order>57</sort_order>
489
+ <show_in_default>1</show_in_default>
490
+ <show_in_website>1</show_in_website>
491
+ <show_in_store>0</show_in_store>
492
+ </min_shipping9>
493
+ <max_shipping9 translate="label">
494
+ <label>• Maximum order amount</label>
495
+ <frontend_type>text</frontend_type>
496
+ <sort_order>58</sort_order>
497
+ <show_in_default>1</show_in_default>
498
+ <show_in_website>1</show_in_website>
499
+ <show_in_store>0</show_in_store>
500
+ </max_shipping9>
501
  <name10 translate="label">
502
  <label>Event / Method 10 >></label>
503
  <frontend_type>text</frontend_type>
504
+ <sort_order>59</sort_order>
505
  <show_in_default>1</show_in_default>
506
  <show_in_website>1</show_in_website>
507
  <show_in_store>1</show_in_store>
509
  <price10 translate="label">
510
  <label>• Price (0.00)</label>
511
  <frontend_type>text</frontend_type>
512
+ <sort_order>60</sort_order>
513
  <show_in_default>1</show_in_default>
514
  <show_in_website>1</show_in_website>
515
  <show_in_store>1</show_in_store>
517
  <details10 translate="label">
518
  <label>• Details</label>
519
  <frontend_type>textarea</frontend_type>
520
+ <sort_order>61</sort_order>
521
  <show_in_default>1</show_in_default>
522
  <show_in_website>1</show_in_website>
523
  <show_in_store>1</show_in_store>
526
  <label>• Type</label>
527
  <frontend_type>select</frontend_type>
528
  <source_model>adminhtml/system_config_source_shipping_flatrate</source_model>
529
+ <sort_order>62</sort_order>
530
  <show_in_default>1</show_in_default>
531
  <show_in_website>1</show_in_website>
532
  <show_in_store>0</show_in_store>
533
  </type10>
534
+ <min_shipping10 translate="label">
535
+ <label>• Minimum order amount</label>
536
+ <frontend_type>text</frontend_type>
537
+ <sort_order>63</sort_order>
538
+ <show_in_default>1</show_in_default>
539
+ <show_in_website>1</show_in_website>
540
+ <show_in_store>0</show_in_store>
541
+ </min_shipping10>
542
+ <max_shipping10 translate="label">
543
+ <label>• Maximum order amount</label>
544
+ <frontend_type>text</frontend_type>
545
+ <sort_order>64</sort_order>
546
+ <show_in_default>1</show_in_default>
547
+ <show_in_website>1</show_in_website>
548
+ <show_in_store>0</show_in_store>
549
+ </max_shipping10>
550
  <sallowspecific translate="label">
551
  <label>Ship to applicable countries</label>
552
  <frontend_type>select</frontend_type>
app/design/frontend/default/minerva_default/template/checkout/cart/shipping.phtml CHANGED
@@ -22,74 +22,99 @@
22
  * @see Mage_Checkout_Block_Cart_Shipping
23
  */
24
  ?>
 
25
  <div class="shipping-estimate box">
26
- <h4><?php echo $this->__('Estimate Shipping and Tax') ?></h4>
27
- <form action="<?php echo $this->getUrl('checkout/cart/estimatePost') ?>" method="post" id="shipping-zip-form">
28
  <p><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
29
- <p><label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label><br /><span><?php echo Mage::getBlockSingleton('directory/data')->getCountryHtmlSelect($this->getEstimateCountryId()) ?></span></p>
 
 
 
30
  <?php //if($this->getStateActive()): ?>
31
  <p>
32
- <label for="region_id"><?php echo $this->__('State/Province') ?><?php if ($this->isStateProvinceRequired()):?> <span class="required">*</span><?php endif;?></label><br />
33
- <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" style="display:none"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
34
- <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
35
- </select>
36
- <script type="text/javascript">
 
 
 
 
 
37
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
38
  </script>
39
- <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getEstimateRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" />
40
  </p>
41
  <?php //endif; ?>
42
  <?php if($this->getCityActive()): ?>
43
- <p><label for="city"><?php echo $this->__('City') ?><?php if ($this->isCityRequired()):?> <span class="required">*</span><?php endif;?></label><br />
44
- <input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->htmlEscape($this->getEstimateCity()) ?>" />
45
- </p>
 
 
 
 
 
 
46
  <?php endif; ?>
47
- <p><label for="postcode"><?php echo $this->__('Zip/Postal Code') ?><?php if ($this->isZipCodeRequired()):?> <span class="required">*</span><?php endif;?></label><br />
48
- <input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->htmlEscape($this->getEstimatePostcode()) ?>" /></p>
49
- <p><button type="button" onclick="coShippingMethodForm.submit()" class="form-button-alt"><span><?php echo $this->__('Get a Quote') ?></span></button></p>
50
- </form>
51
- <script type="text/javascript">
 
 
 
 
 
 
 
 
 
52
  new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
53
  </script>
54
-
55
- <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
56
- <div class="divider"></div>
57
- <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
58
  <dl class="shipment-methods">
59
- <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
60
- <dt><?php echo $this->getCarrierName($code) ?></dt>
61
- <dd>
62
- <ul>
63
- <?php foreach ($_rates as $_rate): ?>
64
- <li class="<?php if ($_rate->getErrorMessage()) echo 'error-msg';?>">
65
- <?php if ($_rate->getErrorMessage()): ?>
66
- <?php echo $_rate->getErrorMessage() ?>
67
- <?php else: ?>
68
- <input name="estimate_method" type="radio" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> />
69
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
70
- <strong>
71
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
72
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
73
-
74
- <?php echo $_excl; ?>
75
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
76
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
77
- <?php endif; ?>
78
- </strong></label><br/><div class="shipDetails"><?php echo $_rate->getMethodDetails() ?></div>
79
- <?php endif ?>
80
- </li>
81
- <?php endforeach; ?>
82
- </ul>
83
- </dd>
84
- <?php endforeach; ?>
 
 
 
85
  </dl>
86
  <fieldset>
87
- <button type="submit" class="form-button-alt" name="do" value="<?php echo $this->__('Update Total') ?>"><span><?php echo $this->__('Update Total') ?></span></button>
88
  </fieldset>
89
- </form>
90
- <?php endif; ?>
91
-
92
- <script type="text/javascript">
93
  var coShippingMethodForm = new VarienForm('shipping-zip-form');
94
  Validation.addAllThese(
95
  [
@@ -105,4 +130,4 @@
105
  ]
106
  );
107
  </script>
108
- </div>
22
  * @see Mage_Checkout_Block_Cart_Shipping
23
  */
24
  ?>
25
+
26
  <div class="shipping-estimate box">
27
+ <h4><?php echo $this->__('Estimate Shipping and Tax') ?></h4>
28
+ <form action="<?php echo $this->getUrl('checkout/cart/estimatePost') ?>" method="post" id="shipping-zip-form">
29
  <p><?php echo $this->__('Enter your destination to get a shipping estimate.') ?></p>
30
+ <p>
31
+ <label for="country"><?php echo $this->__('Country') ?> <span class="required">*</span></label>
32
+ <br />
33
+ <span><?php echo Mage::getBlockSingleton('directory/data')->getCountryHtmlSelect($this->getEstimateCountryId()) ?></span></p>
34
  <?php //if($this->getStateActive()): ?>
35
  <p>
36
+ <label for="region_id"><?php echo $this->__('State/Province') ?>
37
+ <?php if ($this->isStateProvinceRequired()):?>
38
+ <span class="required">*</span>
39
+ <?php endif;?>
40
+ </label>
41
+ <br />
42
+ <select id="region_id" name="region_id" title="<?php echo $this->__('State/Province') ?>" style="display:none"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
43
+ <option value=""><?php echo $this->__('Please select region, state or province') ?></option>
44
+ </select>
45
+ <script type="text/javascript">
46
  $('region_id').setAttribute('defaultValue', "<?php echo $this->getEstimateRegionId() ?>");
47
  </script>
48
+ <input type="text" id="region" name="region" value="<?php echo $this->htmlEscape($this->getEstimateRegion()) ?>" title="<?php echo $this->__('State/Province') ?>" class="input-text" style="display:none" />
49
  </p>
50
  <?php //endif; ?>
51
  <?php if($this->getCityActive()): ?>
52
+ <p>
53
+ <label for="city"><?php echo $this->__('City') ?>
54
+ <?php if ($this->isCityRequired()):?>
55
+ <span class="required">*</span>
56
+ <?php endif;?>
57
+ </label>
58
+ <br />
59
+ <input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->htmlEscape($this->getEstimateCity()) ?>" />
60
+ </p>
61
  <?php endif; ?>
62
+ <p>
63
+ <label for="postcode"><?php echo $this->__('Zip/Postal Code') ?>
64
+ <?php if ($this->isZipCodeRequired()):?>
65
+ <span class="required">*</span>
66
+ <?php endif;?>
67
+ </label>
68
+ <br />
69
+ <input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->htmlEscape($this->getEstimatePostcode()) ?>" />
70
+ </p>
71
+ <p>
72
+ <button type="button" onclick="coShippingMethodForm.submit()" class="form-button-alt"><span><?php echo $this->__('Get a Quote') ?></span></button>
73
+ </p>
74
+ </form>
75
+ <script type="text/javascript">
76
  new RegionUpdater('country', 'region', 'region_id', <?php echo $this->helper('directory')->getRegionJson() ?>);
77
  </script>
78
+ <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
79
+ <div class="divider"></div>
80
+ <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
 
81
  <dl class="shipment-methods">
82
+ <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
83
+ <dt><?php echo $this->getCarrierName($code) ?></dt>
84
+ <dd>
85
+ <ul>
86
+ <?php foreach ($_rates as $_rate): ?>
87
+ <li class="<?php if ($_rate->getErrorMessage()) echo 'error-msg';?>">
88
+ <?php if ($_rate->getErrorMessage()): ?>
89
+ <?php echo $_rate->getErrorMessage() ?>
90
+ <?php else: ?>
91
+ <input name="estimate_method" type="radio" value="<?php echo $this->htmlEscape($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> />
92
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?> <strong>
93
+ <?php if($_rate->getPrice() != ""): ?>
94
+ <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
95
+ <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
96
+ <?php echo $_excl; ?>
97
+ <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
98
+ (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
99
+ <?php endif; ?>
100
+ <?php else: ?>
101
+ <?php endif; ?>
102
+ </strong></label>
103
+ <br/>
104
+ <div class="shipDetails"><?php echo $_rate->getMethodDetails() ?></div>
105
+ <?php endif; ?>
106
+ </li>
107
+ <?php endforeach; ?>
108
+ </ul>
109
+ </dd>
110
+ <?php endforeach; ?>
111
  </dl>
112
  <fieldset>
113
+ <button type="submit" class="form-button-alt" name="do" value="<?php echo $this->__('Update Total') ?>"><span><?php echo $this->__('Update Total') ?></span></button>
114
  </fieldset>
115
+ </form>
116
+ <?php endif; ?>
117
+ <script type="text/javascript">
 
118
  var coShippingMethodForm = new VarienForm('shipping-zip-form');
119
  Validation.addAllThese(
120
  [
130
  ]
131
  );
132
  </script>
133
+ </div>
app/design/frontend/default/minerva_default/template/checkout/onepage/shipping_method/available.phtml CHANGED
@@ -25,35 +25,44 @@
25
  */
26
  ?>
27
  <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
28
- <strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong>
 
29
  <?php else: ?>
30
  <dl class="shipment-methods">
31
- <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
32
- <dt><?php echo $this->getCarrierName($code) ?></dt>
33
- <dd>
 
 
 
 
 
 
34
  <ul>
35
- <?php foreach ($_rates as $_rate): ?>
36
- <li>
37
- <?php if ($_rate->getErrorMessage()): ?>
38
- <ul class="messages"><li class="error-msg"><ul><li><?php echo $_rate->getErrorMessage() ?></li></ul></li></ul>
39
- <?php else: ?>
40
- <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> />
41
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?>
42
- <strong>
43
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
44
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
45
-
46
- <?php echo $_excl; ?>
47
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
48
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
49
- <?php endif; ?>
50
- </strong>
51
- </label><br /><div class="shipDetails"><?php echo $_rate->getMethodDetails() ?></div>
52
- <?php endif ?>
53
- </li>
54
- <?php endforeach; ?>
55
  </ul>
56
- </dd>
57
- <?php endforeach; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
58
  </dl>
59
- <?php endif; ?>
25
  */
26
  ?>
27
  <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
28
+
29
+ <strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong>
30
  <?php else: ?>
31
  <dl class="shipment-methods">
32
+ <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
33
+ <dt><?php echo $this->getCarrierName($code) ?></dt>
34
+ <dd>
35
+ <ul>
36
+ <?php foreach ($_rates as $_rate): ?>
37
+ <li>
38
+ <?php if ($_rate->getErrorMessage()): ?>
39
+ <ul class="messages">
40
+ <li class="error-msg">
41
  <ul>
42
+ <li><?php echo $_rate->getErrorMessage() ?></li>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
43
  </ul>
44
+ </li>
45
+ </ul>
46
+ <?php else: ?>
47
+ <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> />
48
+ <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $_rate->getMethodTitle() ?> <strong>
49
+ <?php if($_rate->getPrice() != ""): ?>
50
+ <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
51
+ <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
52
+ <?php echo $_excl; ?>
53
+ <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
54
+ (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
55
+ <?php endif; ?>
56
+ <?php else: ?>
57
+ <?php endif; ?>
58
+ </strong> </label>
59
+ <br />
60
+ <div class="shipDetails"><?php echo $_rate->getMethodDetails() ?></div>
61
+ <?php endif ?>
62
+ </li>
63
+ <?php endforeach; ?>
64
+ </ul>
65
+ </dd>
66
+ <?php endforeach; ?>
67
  </dl>
68
+ <?php endif; ?>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Minerva_Shipping</name>
4
- <version>1.3.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>
@@ -18,6 +18,10 @@ This extension is free to the community but I do work on it in my spare time so
18
  &#x2022; Feel free to post any feature requests and I will work on them as time allows (see below).
19
 
20
  &lt;span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;"&gt;Release Notes&lt;/span&gt;
 
 
 
 
21
  1.3.0 - Changes
22
  &#x2022; Extension now allows you to specify charge as "per order" or "per item" for each option.
23
 
@@ -58,9 +62,7 @@ The class shipDetails is built into these two template files. The standard css t
58
  .shipDetails { padding-left: 25px; }
59
 
60
  &lt;span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;"&gt;In Development&lt;/span&gt;
61
- &#x2022; Disable the display of the cost if price field is left blank.
62
  &#x2022; The ability to show/hide the # of options you wish to use.
63
- &#x2022; Set min/max purchase limits for each option.
64
  &#x2022; Extend classes on remaining files to eliminate most version dependency.
65
 
66
  &lt;span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;"&gt;Known Bugs&lt;/span&gt;
@@ -68,8 +70,8 @@ The class shipDetails is built into these two template files. The standard css t
68
  <notes>Added ability to specify charge as "per item" or "per order" for each shipping option.</notes>
69
  <authors><author><name>Sherrie Rohde</name><user>auto-converted</user><email>sherrie@minervapromotions.com</email></author><author><name>Robert Chambers</name><user>auto-converted</user><email>admin@robertchambers.co.uk</email></author><author><name>Shane Harper</name><user>auto-converted</user><email>shane@collinsharper.com</email></author></authors>
70
  <date>2009-05-07</date>
71
- <time>14:24:31</time>
72
- <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="minerva_default"><dir name="template"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="d6a52d117c45c01e7588075562f3a3f3"/></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="72d57e80da895cf962461843608f131d"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Mage"><dir name="Sales"><dir name="Model"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="5bf0e572af50b5af6ec8d033ac3ae651"/></dir></dir></dir></dir></dir><dir name="Minerva"><dir name="Sales"><dir name="Model"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="55207952d3db3f461551abe507379ac4"/></dir></dir></dir></dir><dir name="Shipping"><dir name="etc"><file name="config.xml" hash="9638bb72a1b81c667da58291617a0e55"/><file name="system.xml" hash="62278320ff3569f0a240e8098ec9e6b5"/></dir><dir name="Model"><dir name="Carrier"><file name="Multiflat.php" hash="1b966960b289c607277c8ce785347c8c"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Minerva_Shipping.xml" hash="8d480a535a58a0035fe0c964077a1a97"/></dir></target></contents>
73
  <compatible/>
74
  <dependencies/>
75
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Minerva_Shipping</name>
4
+ <version>1.3.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>
18
  &#x2022; Feel free to post any feature requests and I will work on them as time allows (see below).
19
 
20
  &lt;span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;"&gt;Release Notes&lt;/span&gt;
21
+ 1.3.1 - Changes
22
+ &#x2022; Extension now allows you to set minimum/maximum order totals for each shipping option. These can be left blank if you don't want to use this feature.
23
+ &#x2022; Extension no longer displays price if there is no price entered. If you still want to show $0.00 simply enter "0.00."
24
+
25
  1.3.0 - Changes
26
  &#x2022; Extension now allows you to specify charge as "per order" or "per item" for each option.
27
 
62
  .shipDetails { padding-left: 25px; }
63
 
64
  &lt;span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;"&gt;In Development&lt;/span&gt;
 
65
  &#x2022; The ability to show/hide the # of options you wish to use.
 
66
  &#x2022; Extend classes on remaining files to eliminate most version dependency.
67
 
68
  &lt;span style="display: block; background-color: #ccc; padding: 2px 6px; font-weight: bold;"&gt;Known Bugs&lt;/span&gt;
70
  <notes>Added ability to specify charge as "per item" or "per order" for each shipping option.</notes>
71
  <authors><author><name>Sherrie Rohde</name><user>auto-converted</user><email>sherrie@minervapromotions.com</email></author><author><name>Robert Chambers</name><user>auto-converted</user><email>admin@robertchambers.co.uk</email></author><author><name>Shane Harper</name><user>auto-converted</user><email>shane@collinsharper.com</email></author></authors>
72
  <date>2009-05-07</date>
73
+ <time>20:12:06</time>
74
+ <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="minerva_default"><dir name="template"><dir name="checkout"><dir name="cart"><file name="shipping.phtml" hash="7126e9b9d7200cd53b98b5cc64d2ba93"/></dir><dir name="onepage"><dir name="shipping_method"><file name="available.phtml" hash="4e3964b35abc2237a0f7178e6f0591cf"/></dir></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="Mage"><dir name="Sales"><dir name="Model"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="5bf0e572af50b5af6ec8d033ac3ae651"/></dir></dir></dir></dir></dir><dir name="Minerva"><dir name="Sales"><dir name="Model"><dir name="Quote"><dir name="Address"><file name="Rate.php" hash="55207952d3db3f461551abe507379ac4"/></dir></dir></dir></dir><dir name="Shipping"><dir name="etc"><file name="config.xml" hash="f557c7f4205f2504aa419f257f5354c2"/><file name="system.xml" hash="80fc6fa506e8791ec2fcecb06a845a60"/></dir><dir name="Model"><dir name="Carrier"><file name="Multiflat.php" hash="8c23020292d2ffd49df983ba94ec6b2d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Minerva_Shipping.xml" hash="8d480a535a58a0035fe0c964077a1a97"/></dir></target></contents>
75
  <compatible/>
76
  <dependencies/>
77
  </package>