Interface_Frontend_Base_Default - Version 1.8.1.0

Version Notes

1.8.1.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_Base_Default
Version 1.8.1.0
Comparing to
See all releases


Code changes from version 1.8.0.0 to 1.8.1.0

Files changed (57) hide show
  1. app/design/frontend/base/default/layout/googleanalytics.xml +1 -1
  2. app/design/frontend/base/default/layout/googlecheckout.xml +0 -49
  3. app/design/frontend/base/default/layout/page.xml +1 -0
  4. app/design/frontend/base/default/layout/sales.xml +18 -6
  5. app/design/frontend/base/default/template/bundle/catalog/product/price.phtml +14 -18
  6. app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml +232 -0
  7. app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml +2 -2
  8. app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml +14 -8
  9. app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml +5 -5
  10. app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml +5 -5
  11. app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml +5 -5
  12. app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml +189 -147
  13. app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +232 -148
  14. app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml +189 -151
  15. app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml +10 -10
  16. app/design/frontend/base/default/template/catalog/product/price.phtml +145 -131
  17. app/design/frontend/base/default/template/catalog/rss/product/price.phtml +332 -239
  18. app/design/frontend/base/default/template/checkout/cart.phtml +1 -0
  19. app/design/frontend/base/default/template/checkout/cart/item/default.phtml +13 -12
  20. app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml +2 -2
  21. app/design/frontend/base/default/template/checkout/multishipping/overview.phtml +1 -0
  22. app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml +10 -10
  23. app/design/frontend/base/default/template/checkout/onepage/login.phtml +1 -0
  24. app/design/frontend/base/default/template/checkout/onepage/review/item.phtml +11 -10
  25. app/design/frontend/base/default/template/customer/form/login.phtml +1 -0
  26. app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml +220 -182
  27. app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml +10 -10
  28. app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +51 -41
  29. app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml +60 -45
  30. app/design/frontend/base/default/template/downloadable/email/order/items/order/downloadable.phtml +59 -48
  31. app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +223 -194
  32. app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +220 -199
  33. app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +242 -211
  34. app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml +5 -5
  35. app/design/frontend/base/default/template/email/order/items/invoice/default.phtml +5 -5
  36. app/design/frontend/base/default/template/email/order/items/order/default.phtml +5 -5
  37. app/design/frontend/base/default/template/email/productalert/price.phtml +16 -11
  38. app/design/frontend/base/default/template/email/productalert/stock.phtml +16 -11
  39. app/design/frontend/base/default/template/googlecheckout/form.phtml +0 -30
  40. app/design/frontend/base/default/template/googlecheckout/link.phtml +0 -37
  41. app/design/frontend/base/default/template/page/1column.phtml +1 -0
  42. app/design/frontend/base/default/template/page/2columns-left.phtml +1 -0
  43. app/design/frontend/base/default/template/page/2columns-right.phtml +1 -0
  44. app/design/frontend/base/default/template/page/3columns.phtml +1 -0
  45. app/design/frontend/base/default/template/page/html/cookienotice.phtml +54 -0
  46. app/design/frontend/base/default/template/page/html/notices.phtml +0 -21
  47. app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml +1 -0
  48. app/design/frontend/base/default/template/persistent/customer/form/login.phtml +1 -0
  49. app/design/frontend/base/default/template/review/form.phtml +1 -0
  50. app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml +163 -134
  51. app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml +160 -131
  52. app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml +11 -11
  53. app/design/frontend/base/default/template/tax/checkout/tax.phtml +1 -1
  54. app/design/frontend/base/default/template/tax/order/tax.phtml +20 -3
  55. app/design/frontend/base/default/template/wishlist/view.phtml +28 -12
  56. package.xml +6 -6
  57. skin/frontend/base/default/js/bundle.js +39 -3
app/design/frontend/base/default/layout/googleanalytics.xml CHANGED
@@ -34,7 +34,7 @@ Default layout, loads most of the pages
34
 
35
  <default>
36
  <!-- Mage_GoogleAnalytics -->
37
- <reference name="after_body_start">
38
  <block type="googleanalytics/ga" name="google_analytics" as="google_analytics" template="googleanalytics/ga.phtml" />
39
  </reference>
40
  </default>
34
 
35
  <default>
36
  <!-- Mage_GoogleAnalytics -->
37
+ <reference name="head" before="-">
38
  <block type="googleanalytics/ga" name="google_analytics" as="google_analytics" template="googleanalytics/ga.phtml" />
39
  </reference>
40
  </default>
app/design/frontend/base/default/layout/googlecheckout.xml DELETED
@@ -1,49 +0,0 @@
1
- <?xml version="1.0"?>
2
- <!--
3
- /**
4
- * Magento
5
- *
6
- * NOTICE OF LICENSE
7
- *
8
- * This source file is subject to the Academic Free License (AFL 3.0)
9
- * that is bundled with this package in the file LICENSE_AFL.txt.
10
- * It is also available through the world-wide-web at this URL:
11
- * http://opensource.org/licenses/afl-3.0.php
12
- * If you did not receive a copy of the license and are unable to
13
- * obtain it through the world-wide-web, please send an email
14
- * to license@magentocommerce.com so we can send you a copy immediately.
15
- *
16
- * DISCLAIMER
17
- *
18
- * Do not edit or add to this file if you wish to upgrade Magento to newer
19
- * versions in the future. If you wish to customize Magento for your
20
- * needs please refer to http://www.magentocommerce.com for more information.
21
- *
22
- * @category design
23
- * @package base_default
24
- * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
25
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
- */
27
-
28
- -->
29
- <layout version="0.1.0">
30
-
31
- <checkout_cart_index>
32
- <reference name="checkout.cart.top_methods">
33
- <block type="googlecheckout/link" name="checkout.cart.methods.googlecheckout.top" template="googlecheckout/link.phtml" before="-"/>
34
- </reference>
35
-
36
- <reference name="checkout.cart.methods">
37
- <block type="googlecheckout/link" name="checkout.cart.methods.googlecheckout.bottom" template="googlecheckout/link.phtml"/>
38
- </reference>
39
- </checkout_cart_index>
40
-
41
- <googlecheckout_redirect_redirect>
42
- <reference name="root">
43
- <action method="setTemplate"><template>page/2columns-right.phtml</template></action>
44
- </reference>
45
- <reference name="content">
46
- <block type="googlecheckout/redirect" name="googlecheckout_redirect" template="page/redirect.phtml"></block>
47
- </reference>
48
- </googlecheckout_redirect_redirect>
49
- </layout>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/layout/page.xml CHANGED
@@ -108,6 +108,7 @@ Default layout, loads most of the pages
108
 
109
  <block type="core/text_list" name="before_body_end" as="before_body_end" translate="label">
110
  <label>Page Bottom</label>
 
111
  </block>
112
  </block>
113
 
108
 
109
  <block type="core/text_list" name="before_body_end" as="before_body_end" translate="label">
110
  <label>Page Bottom</label>
111
+ <block type="page/html_cookieNotice" name="global_cookie_notice" as ="global_cookie_notice" template="page/html/cookienotice.phtml" before="-" />
112
  </block>
113
  </block>
114
 
app/design/frontend/base/default/layout/sales.xml CHANGED
@@ -230,7 +230,9 @@ Customer account home dashboard layout
230
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
231
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
232
  <action method="setValueProperties"><value>class="last a-right"</value></action>
233
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml" />
 
 
234
  </block>
235
  </block>
236
  </reference>
@@ -255,7 +257,9 @@ Customer account home dashboard layout
255
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
256
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
257
  <action method="setValueProperties"><value>class="a-right"</value></action>
258
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
259
  </block>
260
  </block>
261
  </reference>
@@ -287,7 +291,9 @@ Email layouts section
287
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
288
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
289
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
290
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
291
  </block>
292
  </block>
293
  <block type="core/text_list" name="additional.product.info" />
@@ -307,7 +313,9 @@ Email layouts section
307
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
308
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
309
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
310
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
311
  </block>
312
  </block>
313
  <block type="core/text_list" name="additional.product.info" />
@@ -476,7 +484,9 @@ Guest
476
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
477
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
478
  <action method="setValueProperties"><value>class="last a-right"</value></action>
479
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml" />
 
 
480
  </block>
481
  </block>
482
  </reference>
@@ -499,7 +509,9 @@ Guest
499
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
500
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
501
  <action method="setValueProperties"><value>class="a-right"</value></action>
502
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
503
  </block>
504
  </block>
505
  </reference>
230
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
231
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
232
  <action method="setValueProperties"><value>class="last a-right"</value></action>
233
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
234
+ <action method="setIsPlaneMode"><value>1</value></action>
235
+ </block>
236
  </block>
237
  </block>
238
  </reference>
257
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
258
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
259
  <action method="setValueProperties"><value>class="a-right"</value></action>
260
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
261
+ <action method="setIsPlaneMode"><value>1</value></action>
262
+ </block>
263
  </block>
264
  </block>
265
  </reference>
291
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
292
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
293
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
294
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
295
+ <action method="setIsPlaneMode"><value>1</value></action>
296
+ </block>
297
  </block>
298
  </block>
299
  <block type="core/text_list" name="additional.product.info" />
313
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
314
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
315
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
316
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
317
+ <action method="setIsPlaneMode"><value>1</value></action>
318
+ </block>
319
  </block>
320
  </block>
321
  <block type="core/text_list" name="additional.product.info" />
484
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
485
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
486
  <action method="setValueProperties"><value>class="last a-right"</value></action>
487
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
488
+ <action method="setIsPlaneMode"><value>1</value></action>
489
+ </block>
490
  </block>
491
  </block>
492
  </reference>
509
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
510
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
511
  <action method="setValueProperties"><value>class="a-right"</value></action>
512
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
513
+ <action method="setIsPlaneMode"><value>1</value></action>
514
+ </block>
515
  </block>
516
  </block>
517
  </reference>
app/design/frontend/base/default/template/bundle/catalog/product/price.phtml CHANGED
@@ -51,22 +51,25 @@ $_weeeTaxAmount = 0;
51
  ?>
52
  <?php
53
  if ($_product->getPriceType() == 1) {
54
- $_weeeTaxAmount = $_weeeHelper->getAmount($_product);
55
  $_weeeTaxAmountInclTaxes = $_weeeTaxAmount;
56
  if ($_weeeHelper->isTaxable()) {
57
  $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
58
  $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes);
59
  }
60
  if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))) {
61
- $_minimalPriceTax += $_weeeTaxAmount;
62
  $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
 
 
63
  }
64
  if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)) {
65
  $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
 
66
  }
67
 
68
  if ($_weeeHelper->typeOfDisplay($_product, array(1, 2, 4))) {
69
- $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product);
70
  }
71
  }
72
  ?>
@@ -162,7 +165,7 @@ if ($_product->getPriceType() == 1) {
162
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
163
  <span class="weee">(<small>
164
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
165
- <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
166
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
167
  <?php else: ?>
168
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
@@ -179,17 +182,6 @@ if ($_product->getPriceType() == 1) {
179
  <?php endif; ?>
180
  <?php endif; ?>
181
  </p>
182
- <?php
183
- if ($_product->getPriceType() == 1) {
184
- if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))) {
185
- $_maximalPriceTax += $_weeeTaxAmount;
186
- $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
187
- }
188
- if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)) {
189
- $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
190
- }
191
- }
192
- ?>
193
  <p class="price-to">
194
  <span class="price-label"><?php echo $this->__('To') ?>:</span>
195
  <?php if ($this->displayBothPrices()): ?>
@@ -225,7 +217,7 @@ if ($_product->getPriceType() == 1) {
225
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
226
  <span class="weee">(<small>
227
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
228
- <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
229
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
230
  <?php else: ?>
231
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
@@ -272,7 +264,7 @@ if ($_product->getPriceType() == 1) {
272
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
273
  <span class="weee">(<small>
274
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
275
- <?php if ($_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
276
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
277
  <?php else: ?>
278
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
@@ -285,7 +277,11 @@ if ($_product->getPriceType() == 1) {
285
  </small>)</span>
286
  <?php endif; ?>
287
  <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
288
- <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
 
 
 
 
289
  <?php endif; ?>
290
  <?php endif; ?>
291
  <?php endif; ?>
51
  ?>
52
  <?php
53
  if ($_product->getPriceType() == 1) {
54
+ $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product);
55
  $_weeeTaxAmountInclTaxes = $_weeeTaxAmount;
56
  if ($_weeeHelper->isTaxable()) {
57
  $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
58
  $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes);
59
  }
60
  if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))) {
61
+ $_minimalPriceTax += $_weeeTaxAmount;
62
  $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
63
+ $_maximalPriceTax += $_weeeTaxAmount;
64
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
65
  }
66
  if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)) {
67
  $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
68
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
69
  }
70
 
71
  if ($_weeeHelper->typeOfDisplay($_product, array(1, 2, 4))) {
72
+ $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
73
  }
74
  }
75
  ?>
165
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
166
  <span class="weee">(<small>
167
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
168
+ <?php if ($_taxHelper->displayPriceIncludingTax() || $_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
169
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
170
  <?php else: ?>
171
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
182
  <?php endif; ?>
183
  <?php endif; ?>
184
  </p>
 
 
 
 
 
 
 
 
 
 
 
185
  <p class="price-to">
186
  <span class="price-label"><?php echo $this->__('To') ?>:</span>
187
  <?php if ($this->displayBothPrices()): ?>
217
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
218
  <span class="weee">(<small>
219
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
220
+ <?php if ($_taxHelper->displayPriceIncludingTax() || $_weeeHelper->typeOfDisplay($_product, array(2, 4))): ?>
221
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
222
  <?php else: ?>
223
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
264
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $_weeeHelper->typeOfDisplay($_product, array(2, 1, 4))): ?>
265
  <span class="weee">(<small>
266
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
267
+ <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
268
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
269
  <?php else: ?>
270
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
277
  </small>)</span>
278
  <?php endif; ?>
279
  <?php if ($_weeeHelper->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
280
+ <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
281
+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
282
+ <?php else: ?>
283
+ <?php echo $_coreHelper->currency($_minimalPriceTax + $_weeeTaxAmount) ?>
284
+ <?php endif; ?>
285
  <?php endif; ?>
286
  <?php endif; ?>
287
  <?php endif; ?>
app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml ADDED
@@ -0,0 +1,232 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Magento
4
+ *
5
+ * NOTICE OF LICENSE
6
+ *
7
+ * This source file is subject to the Academic Free License (AFL 3.0)
8
+ * that is bundled with this package in the file LICENSE_AFL.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://opensource.org/licenses/afl-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 design
22
+ * @package base_default
23
+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
+ */
26
+ ?>
27
+
28
+ <?php
29
+ /**
30
+ * @see Mage_Catalog_Block_Product_View
31
+ */
32
+ $_product = $this->getProduct();
33
+ $_tierPrices = $this->getTierPrices($_product, $this->getParent());
34
+ $_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true);
35
+
36
+ /** @var $_catalogHelper Mage_Catalog_Helper_Data */
37
+ $_catalogHelper = Mage::helper('catalog');
38
+
39
+ $_weeeTaxAmount = Mage::helper('weee')->getAmountForDisplay($_product);
40
+ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
41
+ $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
42
+ }
43
+
44
+ ?>
45
+ <?php if (count($_tierPrices) > 0): ?>
46
+ <ul class="<?php echo ($this->getInGrouped() ? 'tier-prices-grouped product-pricing-grouped' : 'tier-prices product-pricing'); ?>">
47
+ <?php if ($this->getInGrouped()): ?>
48
+ <?php $_tierPrices = $this->getTierPrices($_product); ?>
49
+ <?php endif; ?>
50
+ <?php Mage::helper('weee')->processTierPrices($_product, $_tierPrices, false); ?>
51
+ <?php foreach ($_tierPrices as $_index => $_price): ?>
52
+ <li class="tier-price tier-<?php echo $_index; ?>">
53
+ <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
54
+ <?php if ($this->getInGrouped()): ?>
55
+ <?php echo $this->__('Buy %1$s for', $_price['price_qty']) ?>:
56
+ <?php else: ?>
57
+ <?php echo $this->__('Buy %1$s', $_price['price_qty']) ?>
58
+ <?php endif; ?>
59
+ <?php else: ?>
60
+
61
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
62
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 0)): ?>
63
+ <?php echo $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?>
64
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 1)): ?>
65
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
66
+ <?php if ($_weeeTaxAttributes): ?>
67
+ (<small>
68
+ <?php echo $this->__('%1$s incl tax.', $_price['formated_price_incl_weee']); ?>
69
+ <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
70
+ <?php echo $separator; ?>
71
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
72
+ <?php endforeach; ?>
73
+ </small>)
74
+ <?php endif; ?>
75
+ <?php echo $this->__('each') ?>
76
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 4)): ?>
77
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
78
+ <?php if ($_weeeTaxAttributes): ?>
79
+ (<small>
80
+ <?php echo $this->__('%1$s incl tax.', $_price['formated_price_incl_weee']); ?>
81
+ <?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
82
+ <?php echo $separator; ?>
83
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
84
+ <?php endforeach; ?>
85
+ </small>)
86
+ <?php endif; ?>
87
+ <?php echo $this->__('each') ?>
88
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 2)): ?>
89
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']); ?>
90
+ <?php if ($_weeeTaxAttributes): ?>
91
+ (<small>
92
+ <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
93
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
94
+ <?php endforeach; ?>
95
+ <?php echo $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']); ?>
96
+ </small>)
97
+ <?php endif; ?>
98
+ <?php echo $this->__('each') ?>
99
+ <?php else: ?>
100
+ <?php echo $this->__('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
101
+ <?php endif; ?>
102
+ <?php else: ?>
103
+ <?php if ($this->helper('tax')->displayPriceIncludingTax()): ?>
104
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 0)): ?>
105
+ <?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee']) ?>
106
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 1)): ?>
107
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
108
+ <?php if ($_weeeTaxAttributes): ?>
109
+ (<small>
110
+ <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
111
+ <?php echo $separator; ?>
112
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
113
+ <?php $separator = ' + '; endforeach; ?>
114
+ </small>)
115
+ <?php endif; ?>
116
+ <?php echo $this->__('each') ?>
117
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 4)): ?>
118
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
119
+ <?php if ($_weeeTaxAttributes): ?>
120
+ (<small>
121
+ <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
122
+ <?php echo $separator; ?>
123
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
124
+ <?php $separator = ' + '; endforeach; ?>
125
+ </small>)
126
+ <?php endif; ?>
127
+ <?php echo $this->__('each') ?>
128
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 2)): ?>
129
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_tax']); ?>
130
+ <?php if ($_weeeTaxAttributes): ?>
131
+ (<small>
132
+ <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
133
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
134
+ <?php endforeach; ?>
135
+ <?php echo $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']); ?>
136
+ </small>)
137
+ <?php endif; ?>
138
+ <?php echo $this->__('each') ?>
139
+ <?php else: ?>
140
+ <?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_tax']) ?>
141
+ <?php endif; ?>
142
+ <?php else: ?>
143
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 0)): ?>
144
+ <?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee_only']) ?>
145
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 1)): ?>
146
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
147
+ <?php if ($_weeeTaxAttributes): ?>
148
+ (<small>
149
+ <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
150
+ <?php echo $separator; ?>
151
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
152
+ <?php $separator = ' + '; endforeach; ?>
153
+ </small>)
154
+ <?php endif; ?>
155
+ <?php echo $this->__('each') ?>
156
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 4)): ?>
157
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
158
+ <?php if ($_weeeTaxAttributes): ?>
159
+ (<small>
160
+ <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
161
+ <?php echo $separator; ?>
162
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
163
+ <?php $separator = ' + '; endforeach; ?>
164
+ </small>)
165
+ <?php endif; ?>
166
+ <?php echo $this->__('each') ?>
167
+ <?php elseif(Mage::helper('weee')->typeOfDisplay($_product, 2)): ?>
168
+ <?php echo $this->__('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']); ?>
169
+ <?php if ($_weeeTaxAttributes): ?>
170
+ (<small>
171
+ <?php foreach ($_weeeTaxAttributes as $_attribute): ?>
172
+ <?php echo $_attribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_attribute->getAmount()); ?>
173
+ <?php endforeach; ?>
174
+ <?php echo $this->__('Total incl. Tax: %1$s', $_price['formated_price_incl_weee_only']); ?>
175
+ </small>)
176
+ <?php endif; ?>
177
+ <?php echo $this->__('each') ?>
178
+ <?php else: ?>
179
+ <?php echo $this->__('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price']) ?>
180
+ <?php endif; ?>
181
+ <?php endif; ?>
182
+ <?php endif; ?>
183
+
184
+ <?php endif; // Can apply MSRP ?>
185
+
186
+ <?php if (!$this->getInGrouped()): ?>
187
+ <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
188
+ || ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
189
+ <?php echo $this->__('and') ?>&nbsp;<strong class="benefit"><?php echo $this->__('save')?>&nbsp;<span class="percent tier-fixed"><?php echo $_price['savePercent']?></span>%
190
+ <?php endif ?></strong>
191
+ <?php endif; ?>
192
+
193
+ <?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
194
+ <?php $popupId = 'msrp-popup-' . $_product->getId() . $this->helper('core')->getRandomString(20); ?>
195
+ <a href="#" id="<?php echo($popupId);?>"><?php echo $this->__('Click for price'); ?></a>
196
+ <script type="text/javascript">
197
+ <?php
198
+ $addToCartUrl = $this->getProduct()->isSalable()
199
+ ? $this->getAddToCartUrl($_product, array('qty' => $_price['price_qty']))
200
+ : '';
201
+ ?>
202
+ <?php if (!$this->getInGrouped()): ?>
203
+ var newLink = {
204
+ url: "<?php echo $addToCartUrl; ?>",
205
+ qty: "<?php echo $_price['price_qty']?>"
206
+ };
207
+ <?php else: ?>
208
+ var newLink = {
209
+ url: "<?php echo $addToCartUrl; ?>",
210
+ notUseForm: true
211
+ };
212
+ <?php endif ?>
213
+ Catalog.Map.addHelpLink(
214
+ $('<?php echo $popupId ?>'),
215
+ "<?php echo $_product->getName() ?>",
216
+ <?php echo json_encode($_price['real_price_html']) ?>,
217
+ "<?php echo $this->helper('core')->currency($_product->getMsrp(),true,false) ?>",
218
+ newLink
219
+ );
220
+ </script>
221
+ <?php else: ?>
222
+ <span class="msrp-price-hide-message">
223
+ <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
224
+ </span>
225
+ <?php endif; ?>
226
+
227
+
228
+ </li>
229
+
230
+ <?php endforeach ?>
231
+ </ul>
232
+ <?php endif;?>
app/design/frontend/base/default/template/bundle/catalog/product/view/price.phtml CHANGED
@@ -32,7 +32,7 @@
32
  if ($_product->getPriceType() == 1) {
33
  $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
34
  if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
35
- $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
36
  }
37
  }
38
  $isMAPTypeOnGesture = Mage::helper('catalog')->isShowPriceOnGesture($_product);
@@ -87,7 +87,7 @@ $canApplyMAP = Mage::helper('catalog')->canApplyMsrp($_product);
87
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
88
  <span class="weee">(<small>
89
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
90
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
91
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
92
  <?php else: ?>
93
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
32
  if ($_product->getPriceType() == 1) {
33
  $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
34
  if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
35
+ $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
36
  }
37
  }
38
  $isMAPTypeOnGesture = Mage::helper('catalog')->isShowPriceOnGesture($_product);
87
  <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
88
  <span class="weee">(<small>
89
  <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
90
+ <?php if ($this->helper('tax')->displayPriceIncludingTax()): ?>
91
  <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
92
  <?php else: ?>
93
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
app/design/frontend/base/default/template/bundle/catalog/product/view/type/bundle.phtml CHANGED
@@ -27,18 +27,24 @@
27
  ?>
28
  <?php $_product = $this->getProduct() ?>
29
 
30
- <?php if($_product->isSaleable()): ?>
31
- <script type="text/javascript">
32
- //<![CDATA[
33
- var bundle = new Product.Bundle(<?php echo $this->getJsonConfig() ?>);
34
- //]]>
35
- </script>
 
 
 
 
36
  <?php endif; ?>
37
  <?php if ($this->displayProductStockStatus()): ?>
38
  <?php if ($_product->isAvailable()): ?>
39
- <p class="availability in-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('In stock') ?></span></p>
 
40
  <?php else: ?>
41
- <p class="availability out-of-stock"><?php echo $this->helper('catalog')->__('Availability:') ?> <span><?php echo $this->helper('catalog')->__('Out of stock') ?></span></p>
 
42
  <?php endif; ?>
43
  <?php endif; ?>
44
  <div class="price-box-bundle">
27
  ?>
28
  <?php $_product = $this->getProduct() ?>
29
 
30
+ <?php if ($_product->isSaleable()): ?>
31
+ <script type="text/javascript">
32
+ //<![CDATA[
33
+ var bundle = new Product.Bundle(<?php echo $this->getJsonConfig() ?>);
34
+ var taxCalcMethod = "<?php echo Mage::helper('tax')->getConfig()->getAlgorithm($_product->getStore()) ?>";
35
+ var CACL_UNIT_BASE = "<?php echo Mage_Tax_Model_Calculation::CALC_UNIT_BASE ?>";
36
+ var CACL_ROW_BASE = "<?php echo Mage_Tax_Model_Calculation::CALC_ROW_BASE ?>";
37
+ var CACL_TOTAL_BASE = "<?php echo Mage_Tax_Model_Calculation::CALC_TOTAL_BASE ?>";
38
+ //]]>
39
+ </script>
40
  <?php endif; ?>
41
  <?php if ($this->displayProductStockStatus()): ?>
42
  <?php if ($_product->isAvailable()): ?>
43
+ <p class="availability in-stock"><?php echo $this->helper('catalog')->__('Availability:') ?>
44
+ <span><?php echo $this->helper('catalog')->__('In stock') ?></span></p>
45
  <?php else: ?>
46
+ <p class="availability out-of-stock"><?php echo $this->helper('catalog')->__('Availability:') ?>
47
+ <span><?php echo $this->helper('catalog')->__('Out of stock') ?></span></p>
48
  <?php endif; ?>
49
  <?php endif; ?>
50
  <div class="price-box-bundle">
app/design/frontend/base/default/template/bundle/email/order/items/creditmemo/default.phtml CHANGED
@@ -88,12 +88,12 @@
88
  </small>
89
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
90
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
91
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
92
  <?php endforeach; ?>
93
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
94
  <small>
95
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
96
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
97
  <?php endforeach; ?>
98
  </small>
99
  <?php endif; ?>
@@ -112,7 +112,7 @@
112
  <?php endif; ?>
113
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
114
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
115
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
116
  <?php else: ?>
117
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
118
  <?php endif; ?>
@@ -121,7 +121,7 @@
121
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
122
  <small>
123
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
125
  <?php endforeach; ?>
126
  </small>
127
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
@@ -137,7 +137,7 @@
137
  <?php endif; ?>
138
 
139
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
140
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
141
  <?php endif; ?>
142
  <?php endif; ?>
143
  <?php endif; ?>
88
  </small>
89
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
90
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
91
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
92
  <?php endforeach; ?>
93
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
94
  <small>
95
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
96
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
97
  <?php endforeach; ?>
98
  </small>
99
  <?php endif; ?>
112
  <?php endif; ?>
113
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
114
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
115
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
116
  <?php else: ?>
117
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
118
  <?php endif; ?>
121
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
122
  <small>
123
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
125
  <?php endforeach; ?>
126
  </small>
127
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
137
  <?php endif; ?>
138
 
139
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
140
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
141
  <?php endif; ?>
142
  <?php endif; ?>
143
  <?php endif; ?>
app/design/frontend/base/default/template/bundle/email/order/items/invoice/default.phtml CHANGED
@@ -89,12 +89,12 @@
89
  </small>
90
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
93
  <?php endforeach; ?>
94
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
95
  <small>
96
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
97
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
98
  <?php endforeach; ?>
99
  </small>
100
  <?php endif; ?>
@@ -113,7 +113,7 @@
113
  <?php endif; ?>
114
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
115
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
116
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
117
  <?php else: ?>
118
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
119
  <?php endif; ?>
@@ -122,7 +122,7 @@
122
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
123
  <small>
124
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
125
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
126
  <?php endforeach; ?>
127
  </small>
128
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
@@ -138,7 +138,7 @@
138
  <?php endif; ?>
139
 
140
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
141
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
142
  <?php endif; ?>
143
  <?php endif; ?>
144
  <?php endif; ?>
89
  </small>
90
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
93
  <?php endforeach; ?>
94
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
95
  <small>
96
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
97
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
98
  <?php endforeach; ?>
99
  </small>
100
  <?php endif; ?>
113
  <?php endif; ?>
114
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
115
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
116
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
117
  <?php else: ?>
118
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
119
  <?php endif; ?>
122
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
123
  <small>
124
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
125
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
126
  <?php endforeach; ?>
127
  </small>
128
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
138
  <?php endif; ?>
139
 
140
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
141
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_inc + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
142
  <?php endif; ?>
143
  <?php endif; ?>
144
  <?php endif; ?>
app/design/frontend/base/default/template/bundle/email/order/items/order/default.phtml CHANGED
@@ -89,12 +89,12 @@
89
  </small>
90
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
93
  <?php endforeach; ?>
94
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
95
  <small>
96
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
97
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
98
  <?php endforeach; ?>
99
  </small>
100
  <?php endif; ?>
@@ -113,7 +113,7 @@
113
  <?php endif; ?>
114
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
115
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
116
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
117
  <?php else: ?>
118
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
119
  <?php endif; ?>
@@ -122,7 +122,7 @@
122
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
123
  <small>
124
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
125
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
126
  <?php endforeach; ?>
127
  </small>
128
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
@@ -138,7 +138,7 @@
138
  <?php endif; ?>
139
 
140
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
141
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
142
  <?php endif; ?>
143
  <?php endif; ?>
144
  <?php endif; ?>
89
  </small>
90
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
93
  <?php endforeach; ?>
94
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
95
  <small>
96
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
97
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
98
  <?php endforeach; ?>
99
  </small>
100
  <?php endif; ?>
113
  <?php endif; ?>
114
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
115
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
116
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
117
  <?php else: ?>
118
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
119
  <?php endif; ?>
122
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
123
  <small>
124
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
125
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
126
  <?php endforeach; ?>
127
  </small>
128
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
138
  <?php endif; ?>
139
 
140
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
141
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
142
  <?php endif; ?>
143
  <?php endif; ?>
144
  <?php endif; ?>
app/design/frontend/base/default/template/bundle/rss/catalog/product/price.phtml CHANGED
@@ -37,63 +37,85 @@
37
  <?php list($_minimalPrice, $_maximalPrice) = $_product->getPriceModel()->getPrices($_product) ?>
38
  <?php $_id = $_product->getId() ?>
39
 
40
- <?php $_weeeTaxAmount = 0; ?>
 
 
 
 
 
 
 
 
 
41
 
42
  <?php $_minimalPriceTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice); ?>
43
  <?php $_minimalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice, true); ?>
44
 
45
  <?php
46
  if ($_product->getPriceType() == 1) {
47
- $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
 
 
 
 
 
 
 
48
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
49
  $_minimalPriceTax += $_weeeTaxAmount;
50
- $_minimalPriceInclTax += $_weeeTaxAmount;
51
  }
52
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
53
- $_minimalPriceInclTax += $_weeeTaxAmount;
54
  }
55
 
56
- if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
57
- $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
58
  }
59
  }
60
  ?>
61
 
62
  <div class="price-box">
63
- <?php if ($_product->getPriceView()): ?>
64
- <p class="minimal-price">
65
- <span class="price-label"><?php echo $this->__('As low as') ?>:</span>
66
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
67
- <span class="price-excluding-tax">
68
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
69
- <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
70
  </span>
71
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
72
- <span class="weee">(<small>
73
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
74
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
75
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
76
- <?php else: ?>
77
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
78
- <?php endif; ?>
 
79
 
80
- <?php echo $_weeeSeparator; ?>
81
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
82
- <?php $_weeeSeparator = ' + '; ?>
83
- <?php endforeach; ?>
84
- </small>)</span>
85
- <?php endif; ?>
86
- <span class="price-including-tax">
87
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
88
- <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
89
  </span>
 
 
 
90
  <?php else: ?>
91
- <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
92
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
93
- <span class="weee">(<small>
94
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
 
 
95
  <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
96
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
97
  <?php else: ?>
98
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
99
  <?php endif; ?>
@@ -103,26 +125,27 @@ if ($_product->getPriceType() == 1) {
103
  <?php $_weeeSeparator = ' + '; ?>
104
  <?php endforeach; ?>
105
  </small>)</span>
106
- <?php endif; ?>
107
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
108
- <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
109
- <?php endif; ?>
110
  <?php endif; ?>
111
- </p>
112
- <?php else: ?>
113
- <?php if ($_minimalPrice <> $_maximalPrice): ?>
114
- <p class="price-from">
115
- <span class="price-label"><?php echo $this->__('From') ?>:</span>
116
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
117
- <span class="price-excluding-tax">
 
 
 
 
118
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
119
- <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
120
  </span>
121
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
122
- <span class="weee">(<small>
123
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
 
124
  <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
125
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
126
  <?php else: ?>
127
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
128
  <?php endif; ?>
@@ -132,18 +155,24 @@ if ($_product->getPriceType() == 1) {
132
  <?php $_weeeSeparator = ' + '; ?>
133
  <?php endforeach; ?>
134
  </small>)</span>
135
- <?php endif; ?>
136
- <span class="price-including-tax">
137
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
138
- <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
139
  </span>
 
 
 
140
  <?php else: ?>
141
- <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
142
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
143
- <span class="weee">(<small>
144
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
145
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
146
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
 
 
 
147
  <?php else: ?>
148
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
149
  <?php endif; ?>
@@ -153,84 +182,38 @@ if ($_product->getPriceType() == 1) {
153
  <?php $_weeeSeparator = ' + '; ?>
154
  <?php endforeach; ?>
155
  </small>)</span>
156
- <?php endif; ?>
157
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
158
- <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
159
- <?php endif; ?>
160
  <?php endif; ?>
161
- </p>
162
- <?php $_maximalPriceTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice); ?>
163
- <?php $_maximalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice, true); ?>
164
- <?php
165
- if ($_product->getPriceType() == 1) {
166
- if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
167
- $_maximalPriceTax += $_weeeTaxAmount;
168
- $_maximalPriceInclTax += $_weeeTaxAmount;
169
- }
170
- if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
171
- $_maximalPriceInclTax += $_weeeTaxAmount;
172
- }
173
- }
174
- ?>
175
- <p class="price-to">
176
- <span class="price-label"><?php echo $this->__('To') ?>:</span>
177
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
178
- <span class="price-excluding-tax">
 
 
 
 
179
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
180
- <?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
181
  </span>
182
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
183
- <span class="weee">(<small>
184
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
185
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
186
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
187
- <?php else: ?>
188
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
189
- <?php endif; ?>
190
-
191
- <?php echo $_weeeSeparator; ?>
192
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
193
- <?php $_weeeSeparator = ' + '; ?>
194
- <?php endforeach; ?>
195
- </small>)</span>
196
- <?php endif; ?>
197
- <span class="price-including-tax">
198
- <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax') ?></span>
199
- <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
200
- </span>
201
- <?php else: ?>
202
- <?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
203
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
204
- <span class="weee">(<small>
205
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
206
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
207
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
208
- <?php else: ?>
209
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
210
- <?php endif; ?>
211
-
212
- <?php echo $_weeeSeparator; ?>
213
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
214
- <?php $_weeeSeparator = ' + '; ?>
215
- <?php endforeach; ?>
216
- </small>)</span>
217
- <?php endif; ?>
218
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
219
- <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
220
- <?php endif; ?>
221
- <?php endif; ?>
222
- </p>
223
- <?php else: ?>
224
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
225
- <span class="price-excluding-tax">
226
- <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
227
- <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
228
- </span>
229
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
230
- <span class="weee">(<small>
231
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
232
  <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
233
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
234
  <?php else: ?>
235
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
236
  <?php endif; ?>
@@ -240,18 +223,24 @@ if ($_product->getPriceType() == 1) {
240
  <?php $_weeeSeparator = ' + '; ?>
241
  <?php endforeach; ?>
242
  </small>)</span>
243
- <?php endif; ?>
244
- <span class="price-including-tax">
245
- <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
246
- <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
247
- </span>
 
 
 
248
  <?php else: ?>
249
- <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
250
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
251
- <span class="weee">(<small>
252
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
253
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
254
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
 
 
 
255
  <?php else: ?>
256
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
257
  <?php endif; ?>
@@ -261,11 +250,64 @@ if ($_product->getPriceType() == 1) {
261
  <?php $_weeeSeparator = ' + '; ?>
262
  <?php endforeach; ?>
263
  </small>)</span>
264
- <?php endif; ?>
265
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
266
- <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
267
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
268
  <?php endif; ?>
269
  <?php endif; ?>
270
  <?php endif; ?>
 
 
271
  </div>
37
  <?php list($_minimalPrice, $_maximalPrice) = $_product->getPriceModel()->getPrices($_product) ?>
38
  <?php $_id = $_product->getId() ?>
39
 
40
+ <?php
41
+ /**
42
+ * @var $_coreHelper Mage_Core_Helper_Data
43
+ * @var $_weeeHelper Mage_Weee_Helper_Data
44
+ * @var $_taxHelper Mage_Tax_Helper_Data
45
+ */
46
+ $_coreHelper = $this->helper('core');
47
+ $_weeeHelper = $this->helper('weee');
48
+ $_taxHelper = $this->helper('tax');
49
+ $_weeeTaxAmount = 0; ?>
50
 
51
  <?php $_minimalPriceTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice); ?>
52
  <?php $_minimalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice, true); ?>
53
 
54
  <?php
55
  if ($_product->getPriceType() == 1) {
56
+ $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product);
57
+ $_weeeTaxAmountInclTaxes = $_weeeTaxAmount;
58
+
59
+ if ($_weeeHelper->isTaxable()) {
60
+ $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
61
+ $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes);
62
+ }
63
+
64
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
65
  $_minimalPriceTax += $_weeeTaxAmount;
66
+ $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
67
  }
68
  if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
69
+ $_minimalPriceInclTax += $_weeeTaxAmountInclTaxes;
70
  }
71
 
72
+ if (Mage::helper('weee')->typeOfDisplay($_product, array(1, 2, 4))) {
73
+ $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true);
74
  }
75
  }
76
  ?>
77
 
78
  <div class="price-box">
79
+ <?php if ($_product->getPriceView()): ?>
80
+ <p class="minimal-price">
81
+ <span class="price-label"><?php echo $this->__('As low as') ?>:</span>
82
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
83
+ <span class="price-excluding-tax">
84
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
85
+ <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
86
  </span>
87
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
88
+ <span class="weee">(<small>
89
+ <?php $_weeeSeparator = '';
90
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
91
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
92
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
93
+ <?php else: ?>
94
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
95
+ <?php endif; ?>
96
 
97
+ <?php echo $_weeeSeparator; ?>
98
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
99
+ <?php $_weeeSeparator = ' + '; ?>
100
+ <?php endforeach; ?>
101
+ </small>)</span>
102
+ <?php endif; ?>
103
+ <span class="price-including-tax">
104
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
105
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
106
  </span>
107
+ <?php else: ?>
108
+ <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
109
+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
110
  <?php else: ?>
111
+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
112
+ <?php endif; ?>
113
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
114
+ <span class="weee">(<small>
115
+ <?php $_weeeSeparator = '';
116
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
117
  <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
118
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
119
  <?php else: ?>
120
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
121
  <?php endif; ?>
125
  <?php $_weeeSeparator = ' + '; ?>
126
  <?php endforeach; ?>
127
  </small>)</span>
 
 
 
 
128
  <?php endif; ?>
129
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
130
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
131
+ <?php endif; ?>
132
+ <?php endif; ?>
133
+ </p>
134
+ <?php else: ?>
135
+ <?php if ($_minimalPrice <> $_maximalPrice): ?>
136
+ <p class="price-from">
137
+ <span class="price-label"><?php echo $this->__('From') ?>:</span>
138
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
139
+ <span class="price-excluding-tax">
140
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
141
+ <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
142
  </span>
143
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
144
+ <span class="weee">(<small>
145
+ <?php $_weeeSeparator = '';
146
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
147
  <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
148
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
149
  <?php else: ?>
150
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
151
  <?php endif; ?>
155
  <?php $_weeeSeparator = ' + '; ?>
156
  <?php endforeach; ?>
157
  </small>)</span>
158
+ <?php endif; ?>
159
+ <span class="price-including-tax">
160
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
161
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
162
  </span>
163
+ <?php else: ?>
164
+ <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
165
+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
166
  <?php else: ?>
167
+ <?php echo $_coreHelper->currency($_minimalPriceTax) ?>
168
+ <?php endif; ?>
169
+
170
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
171
+ <span class="weee">(<small>
172
+ <?php $_weeeSeparator = '';
173
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
174
+ <?php if ($_taxHelper->displayPriceIncludingTax() || Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
175
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
176
  <?php else: ?>
177
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
178
  <?php endif; ?>
182
  <?php $_weeeSeparator = ' + '; ?>
183
  <?php endforeach; ?>
184
  </small>)</span>
 
 
 
 
185
  <?php endif; ?>
186
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
187
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
188
+ <?php endif; ?>
189
+ <?php endif; ?>
190
+ </p>
191
+ <?php $_maximalPriceTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice); ?>
192
+ <?php $_maximalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice, true); ?>
193
+ <?php
194
+ if ($_product->getPriceType() == 1) {
195
+ if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
196
+ $_maximalPriceTax += $_weeeTaxAmount;
197
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
198
+ }
199
+ if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
200
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
201
+ }
202
+ }
203
+ ?>
204
+ <p class="price-to">
205
+ <span class="price-label"><?php echo $this->__('To') ?>:</span>
206
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
207
+ <span class="price-excluding-tax">
208
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
209
+ <?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
210
  </span>
211
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
212
+ <span class="weee">(<small>
213
+ <?php $_weeeSeparator = '';
214
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
215
  <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
216
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
217
  <?php else: ?>
218
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
219
  <?php endif; ?>
223
  <?php $_weeeSeparator = ' + '; ?>
224
  <?php endforeach; ?>
225
  </small>)</span>
226
+ <?php endif; ?>
227
+ <span class="price-including-tax">
228
+ <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax') ?></span>
229
+ <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
230
+ </span>
231
+ <?php else: ?>
232
+ <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
233
+ <?php echo $_coreHelper->currency($_maximalPriceInclTax) ?>
234
  <?php else: ?>
235
+ <?php echo $_coreHelper->currency($_maximalPriceTax) ?>
236
+ <?php endif; ?>
237
+
238
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
239
+ <span class="weee">(<small>
240
+ <?php $_weeeSeparator = '';
241
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
242
+ <?php if ($_taxHelper->displayPriceIncludingTax() || Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
243
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
244
  <?php else: ?>
245
  <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
246
  <?php endif; ?>
250
  <?php $_weeeSeparator = ' + '; ?>
251
  <?php endforeach; ?>
252
  </small>)</span>
253
+ <?php endif; ?>
254
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
255
+ <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
256
+ <?php endif; ?>
257
+ <?php endif; ?>
258
+ </p>
259
+ <?php else: ?>
260
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
261
+ <span class="price-excluding-tax">
262
+ <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
263
+ <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
264
+ </span>
265
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
266
+ <span class="weee">(<small>
267
+ <?php $_weeeSeparator = '';
268
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
269
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
270
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
271
+ <?php else: ?>
272
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
273
+ <?php endif; ?>
274
+
275
+ <?php echo $_weeeSeparator; ?>
276
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
277
+ <?php $_weeeSeparator = ' + '; ?>
278
+ <?php endforeach; ?>
279
+ </small>)</span>
280
+ <?php endif; ?>
281
+ <span class="price-including-tax">
282
+ <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
283
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
284
+ </span>
285
+ <?php else: ?>
286
+ <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
287
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
288
+ <span class="weee">(<small>
289
+ <?php $_weeeSeparator = '';
290
+ foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
291
+ <?php if ($_taxHelper->displayPriceIncludingTax()): ?>
292
+ <?php $amount = $_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(); ?>
293
+ <?php else: ?>
294
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
295
+ <?php endif; ?>
296
+
297
+ <?php echo $_weeeSeparator; ?>
298
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
299
+ <?php $_weeeSeparator = ' + '; ?>
300
+ <?php endforeach; ?>
301
+ </small>)</span>
302
+ <?php endif; ?>
303
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
304
+ <?php if ($_taxHelper->displayPriceIncludingTax()) : ?>
305
+ <?php echo $_coreHelper->currency($_minimalPriceInclTax) ?>
306
+ <?php else: ?>
307
+ <?php echo $_coreHelper->currency($_minimalPriceTax + $_weeeTaxAmount) ?>
308
  <?php endif; ?>
309
  <?php endif; ?>
310
  <?php endif; ?>
311
+ <?php endif; ?>
312
+ <?php endif; ?>
313
  </div>
app/design/frontend/base/default/template/bundle/sales/order/creditmemo/items/renderer.phtml CHANGED
@@ -28,247 +28,329 @@
28
 
29
  <?php $items = $this->getChilds($parentItem) ?>
30
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
31
- <?php $_count = count ($items) ?>
32
  <?php $_index = 0 ?>
33
 
34
  <?php $_prevOptionId = '' ?>
35
 
36
  <?php foreach ($items as $_item): ?>
37
 
38
- <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
39
- <?php $_showlastRow = true ?>
40
- <?php else: ?>
41
- <?php $_showlastRow = false ?>
42
- <?php endif; ?>
43
 
44
- <?php if ($_item->getOrderItem()->getParentItem()): ?>
45
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
46
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
47
- <tr>
48
- <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
49
- <td>&nbsp;</td>
50
- <td>&nbsp;</td>
51
- <td>&nbsp;</td>
52
- <td>&nbsp;</td>
53
- <td>&nbsp;</td>
54
- <td>&nbsp;</td>
55
- </tr>
56
- <?php $_prevOptionId = $attributes['option_id'] ?>
 
 
 
57
  <?php endif; ?>
58
- <?php endif; ?>
59
- <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
60
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
61
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
62
- </td>
63
  <?php else: ?>
64
- <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
 
 
65
  <?php endif; ?>
66
  <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
67
  <td class="a-right">
68
  <?php if ($this->canShowPriceInfo($_item)): ?>
69
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
70
- <span class="price-excl-tax">
71
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
72
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
  <span class="cart-price">
74
  <?php endif; ?>
75
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
76
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
77
  </span>
78
  <?php endif; ?>
79
  <?php endif; ?>
80
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
81
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
82
  <?php else: ?>
83
- <span class="cart-price">
84
  <?php endif; ?>
85
 
86
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
87
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
88
- <?php else: ?>
89
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
90
- <?php endif; ?>
91
 
92
  </span>
93
 
94
 
95
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
96
 
97
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
98
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
99
  <small>
100
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
101
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
102
- <?php endforeach; ?>
 
103
  </small>
104
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
106
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
107
  <?php endforeach; ?>
108
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <small>
110
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
111
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
112
- <?php endforeach; ?>
 
113
  </small>
114
  <?php endif; ?>
115
  </span>
116
 
117
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
118
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
119
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
 
 
120
  </span>
121
  <?php endif; ?>
122
  <?php endif; ?>
123
  </span>
124
- <br />
125
- <?php endif; ?>
126
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
127
  <span class="price-incl-tax">
128
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
129
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
  <span class="cart-price">
131
  <?php endif; ?>
132
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
133
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
134
  </span>
135
  <?php endif; ?>
136
  <?php endif; ?>
137
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
138
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
139
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
140
  <?php else: ?>
141
  <span class="cart-price">
142
  <?php endif; ?>
143
 
144
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
145
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
146
- <?php else: ?>
147
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
148
- <?php endif; ?>
149
 
150
  </span>
151
 
152
 
153
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
154
 
155
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
156
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
157
  <small>
158
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
159
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
160
- <?php endforeach; ?>
 
161
  </small>
162
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
163
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
164
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
165
  <?php endforeach; ?>
166
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
167
  <small>
168
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
169
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
170
- <?php endforeach; ?>
 
171
  </small>
172
  <?php endif; ?>
173
  </span>
174
 
175
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
176
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
177
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
178
  </span>
 
179
  <?php endif; ?>
180
- <?php endif; ?>
181
  </span>
182
- <?php endif; ?>
183
- <?php else: ?>
184
- &nbsp;
185
- <?php endif; ?>
 
 
186
  </td>
187
  <td class="a-center">
188
  <?php if ($this->canShowPriceInfo($_item)): ?>
189
- <?php echo $_item->getQty()*1 ?>
190
  <?php else: ?>
191
  &nbsp;
192
  <?php endif; ?>
193
  </td>
194
  <td class="a-right">
195
  <?php if ($this->canShowPriceInfo($_item)): ?>
196
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
197
- <span class="price-excl-tax">
198
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
199
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
200
  <span class="cart-price">
201
  <?php endif; ?>
202
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
203
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
204
  </span>
205
  <?php endif; ?>
206
  <?php endif; ?>
207
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
208
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
209
  <?php else: ?>
210
- <span class="cart-price">
211
  <?php endif; ?>
212
 
213
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
214
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
215
- <?php else: ?>
216
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
217
- <?php endif; ?>
218
 
219
  </span>
220
 
221
 
222
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
223
 
224
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
225
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
  <small>
227
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
228
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
229
- <?php endforeach; ?>
 
230
  </small>
231
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
232
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
233
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
234
  <?php endforeach; ?>
235
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
236
  <small>
237
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
238
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
239
- <?php endforeach; ?>
 
240
  </small>
241
  <?php endif; ?>
242
  </span>
243
 
244
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
245
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
246
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
 
 
247
  </span>
248
- <?php endif; ?>
249
  <?php endif; ?>
 
250
  </span>
251
- <br />
252
  <?php endif; ?>
253
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
254
- <span class="price-incl-tax">
255
- <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
256
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
  <span class="cart-price">
258
  <?php endif; ?>
259
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
260
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
261
  </span>
262
  <?php endif; ?>
263
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
264
  <?php endif; ?>
265
- </span>
266
- <?php else: ?>
267
- &nbsp;
268
- <?php endif; ?>
269
- <?php else: ?>
270
- &nbsp;
271
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
272
  </td>
273
  <td class="a-right">
274
  <?php if ($this->canShowPriceInfo($_item)): ?>
@@ -276,53 +358,55 @@
276
  <?php else: ?>
277
  &nbsp;
278
  <?php endif; ?>
279
- </td>
280
  <td class="last a-right">
281
  <?php if ($this->canShowPriceInfo($_item)): ?>
282
- <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
283
  <?php else: ?>
284
  &nbsp;
285
  <?php endif; ?>
286
  </td>
287
- </tr>
288
  <?php endforeach; ?>
289
 
290
  <?php if ($_showlastRow): ?>
291
- <tr class="border">
292
- <td>
293
- <?php if($_options = $this->getItemOptions()): ?>
294
- <dl class="item-options">
295
- <?php foreach ($_options as $_option) : ?>
296
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
297
- <?php if (!$this->getPrintStatus()): ?>
298
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
299
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
300
- <?php echo $_formatedOptionValue['value'] ?>
301
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
302
- <div class="truncated_full_value">
303
- <dl class="item-options">
304
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
305
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
306
- </dl>
307
- </div>
308
- <?php endif; ?>
309
- </dd>
310
- <?php else: ?>
311
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
 
 
 
312
  <?php endif; ?>
313
- <?php endforeach; ?>
314
- </dl>
315
- <?php endif; ?>
316
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
317
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
318
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
319
- <?php endif; ?>
320
- </td>
321
- <td>&nbsp;</td>
322
- <td>&nbsp;</td>
323
- <td>&nbsp;</td>
324
- <td>&nbsp;</td>
325
- <td>&nbsp;</td>
326
- <td>&nbsp;</td>
327
- </tr>
328
  <?php endif; ?>
28
 
29
  <?php $items = $this->getChilds($parentItem) ?>
30
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
31
+ <?php $_count = count($items) ?>
32
  <?php $_index = 0 ?>
33
 
34
  <?php $_prevOptionId = '' ?>
35
 
36
  <?php foreach ($items as $_item): ?>
37
 
38
+ <?php if ($this->getItemOptions() || $parentItem->getDescription() || $this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
39
+ <?php $_showlastRow = true ?>
40
+ <?php else: ?>
41
+ <?php $_showlastRow = false ?>
42
+ <?php endif; ?>
43
 
44
+ <?php if ($_item->getOrderItem()->getParentItem()): ?>
45
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
46
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
47
+ <tr>
48
+ <td>
49
+ <div class="option-label"><?php echo $attributes['option_label'] ?></div>
50
+ </td>
51
+ <td>&nbsp;</td>
52
+ <td>&nbsp;</td>
53
+ <td>&nbsp;</td>
54
+ <td>&nbsp;</td>
55
+ <td>&nbsp;</td>
56
+ <td>&nbsp;</td>
57
+ </tr>
58
+ <?php $_prevOptionId = $attributes['option_id'] ?>
59
+ <?php endif; ?>
60
  <?php endif; ?>
61
+ <tr<?php echo (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>
62
+ id="order-item-row-<?php echo $_item->getId() ?>">
63
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
64
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
65
+ </td>
66
  <?php else: ?>
67
+ <td>
68
+ <div class="option-value"><?php echo $this->getValueHtml($_item) ?></div>
69
+ </td>
70
  <?php endif; ?>
71
  <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
72
  <td class="a-right">
73
  <?php if ($this->canShowPriceInfo($_item)): ?>
74
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
75
+ <span class="price-excl-tax">
76
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
77
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
78
  <span class="cart-price">
79
  <?php endif; ?>
80
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
81
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
82
  </span>
83
  <?php endif; ?>
84
  <?php endif; ?>
85
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
86
+ <span class="cart-tax-total"
87
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
88
  <?php else: ?>
89
+ <span class="cart-price">
90
  <?php endif; ?>
91
 
92
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
93
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
94
+ <?php else: ?>
95
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
96
+ <?php endif; ?>
97
 
98
  </span>
99
 
100
 
101
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
102
 
103
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
104
+ style="display:none;">
105
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
106
  <small>
107
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
108
+ <span class="nobr"><?php echo $tax['title']; ?>
109
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
110
+ <?php endforeach; ?>
111
  </small>
112
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
113
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
114
+ <span class="nobr"><small><?php echo $tax['title']; ?>
115
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
116
  <?php endforeach; ?>
117
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
118
  <small>
119
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
120
+ <span class="nobr"><?php echo $tax['title']; ?>
121
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
122
+ <?php endforeach; ?>
123
  </small>
124
  <?php endif; ?>
125
  </span>
126
 
127
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
128
+ <span class="cart-tax-total"
129
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
130
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
131
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
132
  </span>
133
  <?php endif; ?>
134
  <?php endif; ?>
135
  </span>
136
+ <br/>
137
+ <?php endif; ?>
138
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
139
  <span class="price-incl-tax">
140
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
141
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
  <span class="cart-price">
143
  <?php endif; ?>
144
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
145
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
146
  </span>
147
  <?php endif; ?>
148
  <?php endif; ?>
149
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
150
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
151
+ <span class="cart-tax-total"
152
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
153
  <?php else: ?>
154
  <span class="cart-price">
155
  <?php endif; ?>
156
 
157
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
158
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
159
+ <?php else: ?>
160
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
161
+ <?php endif; ?>
162
 
163
  </span>
164
 
165
 
166
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
167
 
168
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
169
+ style="display:none;">
170
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
171
  <small>
172
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
173
+ <span class="nobr"><?php echo $tax['title']; ?>
174
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
175
+ <?php endforeach; ?>
176
  </small>
177
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
178
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
179
+ <span class="nobr"><small><?php echo $tax['title']; ?>
180
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
181
  <?php endforeach; ?>
182
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
183
  <small>
184
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
185
+ <span class="nobr"><?php echo $tax['title']; ?>
186
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
187
+ <?php endforeach; ?>
188
  </small>
189
  <?php endif; ?>
190
  </span>
191
 
192
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
193
+ <span class="cart-tax-total"
194
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
195
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total Incl. Tax'); ?>
196
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
197
  </span>
198
+ <?php endif; ?>
199
  <?php endif; ?>
 
200
  </span>
201
+ <?php endif; ?>
202
+ <?php else: ?>
203
+ &nbsp;
204
+ <?php
205
+ endif;
206
+ ?>
207
  </td>
208
  <td class="a-center">
209
  <?php if ($this->canShowPriceInfo($_item)): ?>
210
+ <?php echo $_item->getQty() * 1 ?>
211
  <?php else: ?>
212
  &nbsp;
213
  <?php endif; ?>
214
  </td>
215
  <td class="a-right">
216
  <?php if ($this->canShowPriceInfo($_item)): ?>
217
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
218
+ <span class="price-excl-tax">
219
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
220
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
221
  <span class="cart-price">
222
  <?php endif; ?>
223
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
224
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
225
  </span>
226
  <?php endif; ?>
227
  <?php endif; ?>
228
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
229
+ <span class="cart-tax-total"
230
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
231
  <?php else: ?>
232
+ <span class="cart-price">
233
  <?php endif; ?>
234
 
235
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
236
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
237
+ <?php else: ?>
238
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
239
+ <?php endif; ?>
240
 
241
  </span>
242
 
243
 
244
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
245
 
246
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
247
+ style="display:none;">
248
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
249
  <small>
250
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
251
+ <span class="nobr"><?php echo $tax['title']; ?>
252
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
253
+ <?php endforeach; ?>
254
  </small>
255
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
256
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
257
+ <span class="nobr"><small><?php echo $tax['title']; ?>
258
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
259
  <?php endforeach; ?>
260
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
261
  <small>
262
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
263
+ <span class="nobr"><?php echo $tax['title']; ?>
264
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
265
+ <?php endforeach; ?>
266
  </small>
267
  <?php endif; ?>
268
  </span>
269
 
270
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
271
+ <span class="cart-tax-total"
272
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
273
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
274
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
275
  </span>
 
276
  <?php endif; ?>
277
+ <?php endif; ?>
278
  </span>
279
+ <br/>
280
  <?php endif; ?>
281
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
282
+ <span class="price-incl-tax">
283
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
284
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
  <span class="cart-price">
286
  <?php endif; ?>
287
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
288
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
289
  </span>
290
  <?php endif; ?>
 
291
  <?php endif; ?>
292
+
293
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
294
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
295
+ <span class="cart-tax-total"
296
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
297
+ <?php else: ?>
298
+ <span class="cart-price">
299
+ <?php endif; ?>
300
+
301
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
302
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
303
+ <?php else: ?>
304
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
305
+ <?php endif; ?>
306
+
307
+ </span>
308
+
309
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
310
+ <span class="cart-tax-info"
311
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
312
+ style="display:none;">
313
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
+ <small>
315
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
316
+ <span class="nobr"><?php echo $tax['title']; ?>
317
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
318
+ <?php endforeach; ?>
319
+ </small>
320
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
321
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
322
+ <span class="nobr"><small><?php echo $tax['title']; ?>
323
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
324
+ <?php endforeach; ?>
325
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
326
+ <small>
327
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
328
+ <span class="nobr"><?php echo $tax['title']; ?>
329
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
330
+ <?php endforeach; ?>
331
+ </small>
332
+ <?php endif; ?>
333
+ </span>
334
+
335
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
336
+ <span class="cart-tax-total"
337
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
338
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
339
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
340
+ </span>
341
+ <?php endif; ?>
342
+ <?php endif; ?>
343
+ </span>
344
+ <?php else: ?>
345
+ &nbsp;
346
+ <?php
347
+ endif;
348
+ ?>
349
+ <?php else: ?>
350
+ &nbsp;
351
+ <?php
352
+ endif;
353
+ ?>
354
  </td>
355
  <td class="a-right">
356
  <?php if ($this->canShowPriceInfo($_item)): ?>
358
  <?php else: ?>
359
  &nbsp;
360