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
  <?php endif; ?>
361
+ </td>
362
  <td class="last a-right">
363
  <?php if ($this->canShowPriceInfo($_item)): ?>
364
+ <?php echo $this->getOrder()->formatPrice($_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()) ?>
365
  <?php else: ?>
366
  &nbsp;
367
  <?php endif; ?>
368
  </td>
369
+ </tr>
370
  <?php endforeach; ?>
371
 
372
  <?php if ($_showlastRow): ?>
373
+ <tr class="border">
374
+ <td>
375
+ <?php if ($_options = $this->getItemOptions()): ?>
376
+ <dl class="item-options">
377
+ <?php foreach ($_options as $_option) : ?>
378
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
379
+ <?php if (!$this->getPrintStatus()): ?>
380
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
381
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
382
+ <?php echo $_formatedOptionValue['value'] ?>
383
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
384
+ <div class="truncated_full_value">
385
+ <dl class="item-options">
386
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
387
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
388
+ </dl>
389
+ </div>
390
+ <?php endif; ?>
391
+ </dd>
392
+ <?php else: ?>
393
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
394
+ <?php endif; ?>
395
+ <?php endforeach; ?>
396
+ </dl>
397
  <?php endif; ?>
398
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
399
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
400
+ <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
401
+ class="gift-message-link"
402
+ onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
403
+ <?php endif; ?>
404
+ </td>
405
+ <td>&nbsp;</td>
406
+ <td>&nbsp;</td>
407
+ <td>&nbsp;</td>
408
+ <td>&nbsp;</td>
409
+ <td>&nbsp;</td>
410
+ <td>&nbsp;</td>
411
+ </tr>
 
412
  <?php endif; ?>
app/design/frontend/base/default/template/bundle/sales/order/invoice/items/renderer.phtml CHANGED
@@ -28,162 +28,182 @@
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
 
30
  <?php $items = $this->getChilds($parentItem) ?>
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
- </tr>
54
- <?php $_prevOptionId = $attributes['option_id'] ?>
 
 
 
55
  <?php endif; ?>
56
- <?php endif; ?>
57
- <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
58
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
59
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
60
  <?php else: ?>
61
- <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
 
 
62
  <?php endif; ?>
63
  <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
64
  <td class="a-right">
65
  <?php if ($this->canShowPriceInfo($_item)): ?>
66
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
67
- <span class="price-excl-tax">
68
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
69
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
70
  <span class="cart-price">
71
  <?php endif; ?>
72
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
73
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
74
  </span>
75
  <?php endif; ?>
76
  <?php endif; ?>
77
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
78
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
79
  <?php else: ?>
80
- <span class="cart-price">
81
  <?php endif; ?>
82
 
83
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
85
- <?php else: ?>
86
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
87
- <?php endif; ?>
88
 
89
  </span>
90
 
91
 
92
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
93
 
94
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
95
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
96
  <small>
97
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
98
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
99
- <?php endforeach; ?>
 
100
  </small>
101
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
102
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
103
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
104
  <?php endforeach; ?>
105
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, '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']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
109
- <?php endforeach; ?>
 
110
  </small>
111
  <?php endif; ?>
112
  </span>
113
 
114
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
115
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
116
- <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>
 
 
117
  </span>
118
  <?php endif; ?>
119
  <?php endif; ?>
120
  </span>
121
- <br />
122
- <?php endif; ?>
123
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
124
  <span class="price-incl-tax">
125
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
126
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
127
  <span class="cart-price">
128
  <?php endif; ?>
129
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
130
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
131
  </span>
132
  <?php endif; ?>
133
  <?php endif; ?>
134
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
135
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
137
  <?php else: ?>
138
  <span class="cart-price">
139
  <?php endif; ?>
140
 
141
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
143
- <?php else: ?>
144
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
145
- <?php endif; ?>
146
 
147
  </span>
148
 
149
 
150
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
151
 
152
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
153
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  <small>
155
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
156
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
157
- <?php endforeach; ?>
 
158
  </small>
159
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
160
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
161
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
162
  <?php endforeach; ?>
163
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
164
  <small>
165
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
166
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
167
- <?php endforeach; ?>
 
168
  </small>
169
  <?php endif; ?>
170
  </span>
171
 
172
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
173
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
174
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
175
  </span>
 
176
  <?php endif; ?>
177
- <?php endif; ?>
178
  </span>
179
- <?php endif; ?>
180
- <?php else: ?>
181
- &nbsp;
182
- <?php endif; ?>
 
183
  </td>
184
  <td class="a-center">
185
  <?php if ($this->canShowPriceInfo($_item)): ?>
186
- <?php echo $_item->getQty()*1 ?>
187
  <?php else: ?>
188
  &nbsp;
189
  <?php endif; ?>
@@ -191,162 +211,180 @@
191
  <td class="a-right">
192
  <?php if ($this->canShowPriceInfo($_item)): ?>
193
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
194
- <span class="price-excl-tax">
195
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
196
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
197
  <span class="cart-price">
198
  <?php endif; ?>
199
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
200
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
201
  </span>
202
  <?php endif; ?>
203
  <?php endif; ?>
204
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
205
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
206
  <?php else: ?>
207
- <span class="cart-price">
208
  <?php endif; ?>
209
 
210
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
211
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
212
- <?php else: ?>
213
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
214
- <?php endif; ?>
215
 
216
  </span>
217
 
218
 
219
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
220
 
221
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
222
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
223
  <small>
224
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
225
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
226
- <?php endforeach; ?>
 
227
  </small>
228
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
229
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
230
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
231
  <?php endforeach; ?>
232
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
233
  <small>
234
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
235
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
236
- <?php endforeach; ?>
 
237
  </small>
238
  <?php endif; ?>
239
  </span>
240
 
241
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
242
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
243
- <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>
 
 
244
  </span>
245
  <?php endif; ?>
246
  <?php endif; ?>
247
  </span>
248
- <br />
249
- <?php endif; ?>
250
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
251
  <span class="price-incl-tax">
252
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
253
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
254
  <span class="cart-price">
255
  <?php endif; ?>
256
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
257
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
258
  </span>
259
  <?php endif; ?>
260
  <?php endif; ?>
261
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
262
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
263
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
264
  <?php else: ?>
265
  <span class="cart-price">
266
  <?php endif; ?>
267
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
268
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
269
- <?php else: ?>
270
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
271
- <?php endif; ?>
272
 
273
  </span>
274
 
275
 
276
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
277
 
278
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
279
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
280
  <small>
281
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
282
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
283
- <?php endforeach; ?>
 
284
  </small>
285
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
287
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
288
  <?php endforeach; ?>
289
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
290
  <small>
291
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
292
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
293
- <?php endforeach; ?>
 
294
  </small>
295
  <?php endif; ?>
296
  </span>
297
 
298
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
299
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
300
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
301
  </span>
 
302
  <?php endif; ?>
303
- <?php endif; ?>
304
 
305
 
306
 
307
  </span>
308
- <?php endif; ?>
309
- <?php else: ?>
310
- &nbsp;
311
- <?php endif; ?>
 
312
  </td>
313
- </tr>
314
  <?php endforeach; ?>
315
 
316
  <?php if ($_showlastRow): ?>
317
- <tr class="border">
318
- <td>
319
- <?php if($_options = $this->getItemOptions()): ?>
320
- <dl class="item-options">
321
- <?php foreach ($_options as $_option) : ?>
322
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
323
- <?php if (!$this->getPrintStatus()): ?>
324
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
325
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
326
- <?php echo $_formatedOptionValue['value'] ?>
327
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
328
- <div class="truncated_full_value">
329
- <dl class="item-options">
330
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
331
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
332
- </dl>
333
- </div>
334
- <?php endif; ?>
335
- </dd>
336
- <?php else: ?>
337
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
 
 
 
338
  <?php endif; ?>
339
- <?php endforeach; ?>
340
- </dl>
341
- <?php endif; ?>
342
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
343
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
344
- <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>
345
- <?php endif; ?>
346
- </td>
347
- <td>&nbsp;</td>
348
- <td>&nbsp;</td>
349
- <td>&nbsp;</td>
350
- <td>&nbsp;</td>
351
- </tr>
352
  <?php endif; ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
 
30
  <?php $items = $this->getChilds($parentItem) ?>
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
+ </tr>
56
+ <?php $_prevOptionId = $attributes['option_id'] ?>
57
+ <?php endif; ?>
58
  <?php endif; ?>
59
+ <tr<?php echo (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>
60
+ id="order-item-row-<?php echo $_item->getId() ?>">
61
  <?php if (!$_item->getOrderItem()->getParentItem()): ?>
62
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
63
  <?php else: ?>
64
+ <td>
65
+ <div class="option-value"><?php echo $this->getValueHtml($_item) ?></div>
66
+ </td>
67
  <?php endif; ?>
68
  <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
69
  <td class="a-right">
70
  <?php if ($this->canShowPriceInfo($_item)): ?>
71
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
72
+ <span class="price-excl-tax">
73
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
74
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
75
  <span class="cart-price">
76
  <?php endif; ?>
77
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
78
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
79
  </span>
80
  <?php endif; ?>
81
  <?php endif; ?>
82
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
+ <span class="cart-tax-total"
84
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
85
  <?php else: ?>
86
+ <span class="cart-price">
87
  <?php endif; ?>
88
 
89
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
90
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
91
+ <?php else: ?>
92
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
93
+ <?php endif; ?>
94
 
95
  </span>
96
 
97
 
98
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
99
 
100
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
101
+ style="display:none;">
102
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
103
  <small>
104
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
105
+ <span class="nobr"><?php echo $tax['title']; ?>
106
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
107
+ <?php endforeach; ?>
108
  </small>
109
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
110
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
111
+ <span class="nobr"><small><?php echo $tax['title']; ?>
112
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
113
  <?php endforeach; ?>
114
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
115
  <small>
116
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
117
+ <span class="nobr"><?php echo $tax['title']; ?>
118
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
119
+ <?php endforeach; ?>
120
  </small>
121
  <?php endif; ?>
122
  </span>
123
 
124
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
+ <span class="cart-tax-total"
126
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
127
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
128
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
129
  </span>
130
  <?php endif; ?>
131
  <?php endif; ?>
132
  </span>
133
+ <br/>
134
+ <?php endif; ?>
135
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
136
  <span class="price-incl-tax">
137
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
138
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
139
  <span class="cart-price">
140
  <?php endif; ?>
141
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
142
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
143
  </span>
144
  <?php endif; ?>
145
  <?php endif; ?>
146
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
147
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
+ <span class="cart-tax-total"
149
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
150
  <?php else: ?>
151
  <span class="cart-price">
152
  <?php endif; ?>
153
 
154
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
155
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
156
+ <?php else: ?>
157
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
158
+ <?php endif; ?>
159
 
160
  </span>
161
 
162
 
163
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
164
 
165
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
166
+ style="display:none;">
167
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
168
  <small>
169
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
170
+ <span class="nobr"><?php echo $tax['title']; ?>
171
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
172
+ <?php endforeach; ?>
173
  </small>
174
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
175
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
176
+ <span class="nobr"><small><?php echo $tax['title']; ?>
177
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
178
  <?php endforeach; ?>
179
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
180
  <small>
181
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
182
+ <span class="nobr"><?php echo $tax['title']; ?>
183
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
184
+ <?php endforeach; ?>
185
  </small>
186
  <?php endif; ?>
187
  </span>
188
 
189
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
190
+ <span class="cart-tax-total"
191
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
192
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
193
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
194
  </span>
195
+ <?php endif; ?>
196
  <?php endif; ?>
 
197
  </span>
198
+ <?php endif; ?>
199
+ <?php else: ?>
200
+ &nbsp;
201
+ <?php
202
+ endif; ?>
203
  </td>
204
  <td class="a-center">
205
  <?php if ($this->canShowPriceInfo($_item)): ?>
206
+ <?php echo $_item->getQty() * 1 ?>
207
  <?php else: ?>
208
  &nbsp;
209
  <?php endif; ?>
211
  <td class="a-right">
212
  <?php if ($this->canShowPriceInfo($_item)): ?>
213
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
214
+ <span class="price-excl-tax">
215
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
216
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
  <span class="cart-price">
218
  <?php endif; ?>
219
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
220
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
221
  </span>
222
  <?php endif; ?>
223
  <?php endif; ?>
224
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
225
+ <span class="cart-tax-total"
226
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
227
  <?php else: ?>
228
+ <span class="cart-price">
229
  <?php endif; ?>
230
 
231
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
232
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
233
+ <?php else: ?>
234
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
235
+ <?php endif; ?>
236
 
237
  </span>
238
 
239
 
240
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
241
 
242
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
243
+ style="display:none;">
244
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
245
  <small>
246
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
247
+ <span class="nobr"><?php echo $tax['title']; ?>
248
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
249
+ <?php endforeach; ?>
250
  </small>
251
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
252
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
253
+ <span class="nobr"><small><?php echo $tax['title']; ?>
254
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
255
  <?php endforeach; ?>
256
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
  <small>
258
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
259
+ <span class="nobr"><?php echo $tax['title']; ?>
260
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
261
+ <?php endforeach; ?>
262
  </small>
263
  <?php endif; ?>
264
  </span>
265
 
266
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
267
+ <span class="cart-tax-total"
268
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
269
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
270
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
271
  </span>
272
  <?php endif; ?>
273
  <?php endif; ?>
274
  </span>
275
+ <br/>
276
+ <?php endif; ?>
277
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
278
  <span class="price-incl-tax">
279
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
280
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
281
  <span class="cart-price">
282
  <?php endif; ?>
283
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
284
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
  </span>
286
  <?php endif; ?>
287
  <?php endif; ?>
288
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
289
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
290
+ <span class="cart-tax-total"
291
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
292
  <?php else: ?>
293
  <span class="cart-price">
294
  <?php endif; ?>
295
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
296
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
297
+ <?php else: ?>
298
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
299
+ <?php endif; ?>
300
 
301
  </span>
302
 
303
 
304
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
305
 
306
+ <span class="cart-tax-info"
307
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
308
+ style="display:none;">
309
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
310
  <small>
311
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
312
+ <span class="nobr"><?php echo $tax['title']; ?>
313
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
314
+ <?php endforeach; ?>
315
  </small>
316
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
317
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
318
+ <span class="nobr"><small><?php echo $tax['title']; ?>
319
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
320
  <?php endforeach; ?>
321
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
322
  <small>
323
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
324
+ <span class="nobr"><?php echo $tax['title']; ?>
325
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
326
+ <?php endforeach; ?>
327
  </small>
328
  <?php endif; ?>
329
  </span>
330
 
331
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
332
+ <span class="cart-tax-total"
333
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
334
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
335
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
336
  </span>
337
+ <?php endif; ?>
338
  <?php endif; ?>
 
339
 
340
 
341
 
342
  </span>
343
+ <?php endif; ?>
344
+ <?php else: ?>
345
+ &nbsp;
346
+ <?php
347
+ endif; ?>
348
  </td>
349
+ </tr>
350
  <?php endforeach; ?>
351
 
352
  <?php if ($_showlastRow): ?>
353
+ <tr class="border">
354
+ <td>
355
+ <?php if ($_options = $this->getItemOptions()): ?>
356
+ <dl class="item-options">
357
+ <?php foreach ($_options as $_option) : ?>
358
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
359
+ <?php if (!$this->getPrintStatus()): ?>
360
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
361
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
362
+ <?php echo $_formatedOptionValue['value'] ?>
363
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
364
+ <div class="truncated_full_value">
365
+ <dl class="item-options">
366
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
367
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
368
+ </dl>
369
+ </div>
370
+ <?php endif; ?>
371
+ </dd>
372
+ <?php else: ?>
373
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
374
+ <?php endif; ?>
375
+ <?php endforeach; ?>
376
+ </dl>
377
  <?php endif; ?>
378
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
379
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
380
+ <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
381
+ class="gift-message-link"
382
+ onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
383
+ <?php endif; ?>
384
+ </td>
385
+ <td>&nbsp;</td>
386
+ <td>&nbsp;</td>
387
+ <td>&nbsp;</td>
388
+ <td>&nbsp;</td>
389
+ </tr>
 
390
  <?php endif; ?>
app/design/frontend/base/default/template/bundle/sales/order/items/renderer.phtml CHANGED
@@ -99,12 +99,12 @@
99
  </small>
100
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
103
  <?php endforeach; ?>
104
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
  <small>
106
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
107
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
108
  <?php endforeach; ?>
109
  </small>
110
  <?php endif; ?>
@@ -138,7 +138,7 @@
138
  <?php endif; ?>
139
 
140
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
142
  <?php else: ?>
143
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
144
  <?php endif; ?>
@@ -152,7 +152,7 @@
152
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
153
  <small>
154
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
156
  <?php endforeach; ?>
157
  </small>
158
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -170,7 +170,7 @@
170
 
171
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
172
  <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
173
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
174
  </span>
175
  <?php endif; ?>
176
  <?php endif; ?>
@@ -242,12 +242,12 @@
242
  </small>
243
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
244
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
245
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
246
  <?php endforeach; ?>
247
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
  <small>
249
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
250
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
251
  <?php endforeach; ?>
252
  </small>
253
  <?php endif; ?>
@@ -280,7 +280,7 @@
280
  <span class="cart-price">
281
  <?php endif; ?>
282
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
283
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
284
  <?php else: ?>
285
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
286
  <?php endif; ?>
@@ -294,7 +294,7 @@
294
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
295
  <small>
296
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
297
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
298
  <?php endforeach; ?>
299
  </small>
300
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -312,7 +312,7 @@
312
 
313
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
  <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
315
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
316
  </span>
317
  <?php endif; ?>
318
  <?php endif; ?>
99
  </small>
100
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
103
  <?php endforeach; ?>
104
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
  <small>
106
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
107
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
108
  <?php endforeach; ?>
109
  </small>
110
  <?php endif; ?>
138
  <?php endif; ?>
139
 
140
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
142
  <?php else: ?>
143
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
144
  <?php endif; ?>
152
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
153
  <small>
154
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
156
  <?php endforeach; ?>
157
  </small>
158
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
 
171
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
172
  <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
173
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
174
  </span>
175
  <?php endif; ?>
176
  <?php endif; ?>
242
  </small>
243
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
244
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
245
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
246
  <?php endforeach; ?>
247
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
  <small>
249
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
250
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
251
  <?php endforeach; ?>
252
  </small>
253
  <?php endif; ?>
280
  <span class="cart-price">
281
  <?php endif; ?>
282
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
283
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
284
  <?php else: ?>
285
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
286
  <?php endif; ?>
294
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
295
  <small>
296
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
297
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
298
  <?php endforeach; ?>
299
  </small>
300
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
312
 
313
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
  <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
315
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
316
  </span>
317
  <?php endif; ?>
318
  <?php endif; ?>
app/design/frontend/base/default/template/catalog/product/price.phtml CHANGED
@@ -33,40 +33,42 @@
33
  */
34
  ?>
35
  <?php
36
- $_coreHelper = $this->helper('core');
37
- $_weeeHelper = $this->helper('weee');
38
- $_taxHelper = $this->helper('tax');
39
- /* @var $_coreHelper Mage_Core_Helper_Data */
40
- /* @var $_weeeHelper Mage_Weee_Helper_Data */
41
- /* @var $_taxHelper Mage_Tax_Helper_Data */
42
 
43
- $_product = $this->getProduct();
44
- $_storeId = $_product->getStoreId();
45
- $_id = $_product->getId();
46
- $_weeeSeparator = '';
47
- $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
48
- $_minimalPriceValue = $_product->getMinimalPrice();
49
- $_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);
50
- $_specialPriceStoreLabel = $this->getProductAttribute('special_price')->getStoreLabel();
 
 
 
51
  ?>
52
 
53
  <?php if (!$_product->isGrouped()): ?>
54
  <?php $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product); ?>
55
- <?php if ($_weeeHelper->typeOfDisplay($_product, array(Mage_Weee_Model_Tax::DISPLAY_INCL_DESCR, Mage_Weee_Model_Tax::DISPLAY_EXCL_DESCR_INCL, 4))): ?>
56
- <?php $_weeeTaxAmount = $_weeeHelper->getAmount($_product); ?>
57
- <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product); ?>
58
- <?php endif; ?>
59
  <?php $_weeeTaxAmountInclTaxes = $_weeeTaxAmount; ?>
60
- <?php if ($_weeeHelper->isTaxable() && !$_taxHelper->priceIncludesTax($_storeId)): ?>
61
- <?php $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true); ?>
62
- <?php $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes); ?>
63
  <?php endif; ?>
 
 
64
 
65
  <div class="price-box">
66
- <?php $_price = $_taxHelper->getPrice($_product, $_product->getPrice()) ?>
67
- <?php $_regularPrice = $_taxHelper->getPrice($_product, $_product->getPrice(), $_simplePricesTax) ?>
68
- <?php $_finalPrice = $_taxHelper->getPrice($_product, $_product->getFinalPrice()) ?>
69
- <?php $_finalPriceInclTax = $_taxHelper->getPrice($_product, $_product->getFinalPrice(), true) ?>
 
70
  <?php $_weeeDisplayType = $_weeeHelper->getPriceDisplayType(); ?>
71
  <?php if ($_finalPrice >= $_price): ?>
72
  <?php if ($_taxHelper->displayBothPrices()): ?>
@@ -74,46 +76,46 @@
74
  <span class="price-excluding-tax">
75
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
76
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
77
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
78
  </span>
79
  </span>
80
  <span class="price-including-tax">
81
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
82
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
83
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
84
  </span>
85
  </span>
86
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
87
  <span class="price-excluding-tax">
88
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
89
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
90
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
91
  </span>
92
  </span>
93
  <span class="weee">(
94
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
95
- <?php echo $_weeeSeparator; ?>
96
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
97
- <?php $_weeeSeparator = ' + '; ?>
98
  <?php endforeach; ?>
99
- )</span>
100
  <span class="price-including-tax">
101
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
102
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
103
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
104
  </span>
105
  </span>
106
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
107
  <span class="price-excluding-tax">
108
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
109
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
110
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
111
  </span>
112
  </span>
113
  <span class="price-including-tax">
114
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
115
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
116
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
117
  </span>
118
  <span class="weee">(
119
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -127,18 +129,19 @@
127
  <span class="price-excluding-tax">
128
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
129
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
130
- <?php echo $_coreHelper->currency($_price, true, false) ?>
131
  </span>
132
  </span>
133
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
134
  <span class="weee">
135
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
 
136
  </span>
137
  <?php endforeach; ?>
138
  <span class="price-including-tax">
139
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
140
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
141
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
142
  </span>
143
  </span>
144
  <?php else: ?>
@@ -146,38 +149,39 @@
146
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
147
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
148
  <?php if ($_finalPrice == $_price): ?>
149
- <?php echo $_coreHelper->currency($_price, true, false) ?>
150
  <?php else: ?>
151
- <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
152
  <?php endif; ?>
153
  </span>
154
  </span>
155
  <span class="price-including-tax">
156
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
157
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
158
- <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
159
  </span>
160
  </span>
161
  <?php endif; ?>
162
  <?php else: ?>
163
- <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
 
164
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
165
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
166
  </span>
167
- <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
168
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
169
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
170
- </span>
171
- <span class="weee">(
172
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
173
- <?php echo $_weeeSeparator; ?>
174
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
175
- <?php $_weeeSeparator = ' + '; ?>
176
- <?php endforeach; ?>
177
- )</span>
178
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
179
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
180
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
181
  </span>
182
  <span class="weee">(
183
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -187,33 +191,37 @@
187
  <?php endforeach; ?>
188
  )</span>
189
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
190
- <span class="regular-price"><?php echo $_coreHelper->currency($_price,true,true) ?></span><br />
 
191
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
192
  <span class="weee">
193
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
 
194
  </span>
195
  <?php endforeach; ?>
196
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
197
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
 
198
  </span>
199
  <?php else: ?>
200
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
201
  <?php if ($_finalPrice == $_price): ?>
202
- <?php echo $_coreHelper->currency($_price, true, true) ?>
203
  <?php else: ?>
204
- <?php echo $_coreHelper->currency($_finalPrice, true, true) ?>
205
  <?php endif; ?>
206
  </span>
207
  <?php endif; ?>
208
  <?php endif; ?>
209
  <?php else: /* if ($_finalPrice == $_price): */ ?>
210
  <?php $_originalWeeeTaxAmount = $_weeeHelper->getOriginalAmount($_product); ?>
 
211
 
212
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
213
  <p class="old-price">
214
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
215
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
216
- <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
217
  </span>
218
  </p>
219
 
@@ -222,41 +230,42 @@
222
  <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
223
  <span class="price-excluding-tax">
224
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
225
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
226
- <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
 
227
  </span>
228
  </span>
229
  <span class="price-including-tax">
230
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
231
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
232
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
233
  </span>
234
  </span>
235
  </p>
236
  <?php else: ?>
237
- <p class="special-price">
238
- <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
239
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
240
- <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
241
  </span>
242
- </p>
243
  <?php endif; ?>
244
 
245
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
246
  <p class="old-price">
247
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
248
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
249
- <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
250
  </span>
251
  </p>
252
 
253
- <p class="special-price">
254
  <?php if ($_taxHelper->displayBothPrices()): ?>
255
  <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
256
  <span class="price-excluding-tax">
257
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
258
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
259
- <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
260
  </span>
261
  </span>
262
  <span class="weee">(
@@ -265,36 +274,36 @@
265
  <?php echo $_weeeTaxAttribute->getName(); ?>
266
  : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
267
  <?php $_weeeSeparator = ' + '; ?>
268
- <?php endforeach; ?>
269
  )</span>
270
  <span class="price-including-tax">
271
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
272
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
273
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
274
  </span>
275
  </span>
276
  <?php else: ?>
277
  <p class="special-price">
278
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
279
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
280
- <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
281
  </span>
282
  </p>
283
  <span class="weee">(
284
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
285
- <?php echo $_weeeSeparator; ?>
286
- <?php echo $_weeeTaxAttribute->getName(); ?>
287
- : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
288
- <?php $_weeeSeparator = ' + '; ?>
289
  <?php endforeach; ?>
290
- )</span>
291
  <?php endif; ?>
292
- </p>
293
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
294
  <p class="old-price">
295
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
296
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
297
- <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
298
  </span>
299
  </p>
300
 
@@ -303,7 +312,7 @@
303
  <span class="price-excluding-tax">
304
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
305
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
306
- <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmount, true, false) ?>
307
  </span>
308
  </span>
309
  <span class="weee">(
@@ -316,7 +325,7 @@
316
  <span class="price-including-tax">
317
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
318
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
319
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
320
  </span>
321
  </span>
322
  </p>
@@ -324,7 +333,7 @@
324
  <p class="old-price">
325
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
326
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
327
- <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
328
  </span>
329
  </p>
330
 
@@ -333,18 +342,19 @@
333
  <span class="price-excluding-tax">
334
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
335
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
336
- <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
337
  </span>
338
  </span>
339
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
340
  <span class="weee">
341
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
 
342
  </span>
343
  <?php endforeach; ?>
344
  <span class="price-including-tax">
345
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
346
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
347
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
348
  </span>
349
  </span>
350
  </p>
@@ -352,7 +362,7 @@
352
  <p class="old-price">
353
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
354
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
355
- <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
356
  </span>
357
  </p>
358
 
@@ -361,83 +371,87 @@
361
  <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
362
  <span class="price-excluding-tax">
363
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
364
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
365
- <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
 
366
  </span>
367
  </span>
368
  <span class="price-including-tax">
369
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
370
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
371
- <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
 
372
  </span>
373
  </span>
374
  </p>
375
  <?php else: ?>
376
- <p class="special-price">
377
- <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
378
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
379
- <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
380
  </span>
381
- </p>
382
  <?php endif; ?>
383
  <?php endif; ?>
384
 
385
  <?php endif; /* if ($_finalPrice == $_price): */ ?>
386
 
387
- <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_product->getFinalPrice()): ?>
388
 
389
  <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
390
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))): ?>
391
  <?php $_minimalPriceDisplayValue = $_minimalPrice + $_weeeTaxAmount; ?>
392
  <?php endif; ?>
393
 
394
- <?php if ($this->getUseLinkForAsLowAs()):?>
395
- <a href="<?php echo $_product->getProductUrl(); ?>" class="minimal-price-link">
396
- <?php else:?>
397
- <span class="minimal-price-link">
398
- <?php endif?>
399
- <span class="label"><?php echo $this->__('As low as:') ?></span>
400
- <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
401
- <?php echo $_coreHelper->currency($_minimalPriceDisplayValue, true, false) ?>
 
 
 
 
402
  </span>
403
- <?php if ($this->getUseLinkForAsLowAs()):?>
404
- </a>
405
- <?php else:?>
406
- </span>
407
- <?php endif?>
408
  <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
409
  </div>
410
 
411
  <?php else: /* if (!$_product->isGrouped()): */ ?>
412
  <?php
413
- $showMinPrice = $this->getDisplayMinimalPrice();
414
- if ($showMinPrice && $_minimalPriceValue) {
415
- $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
416
- $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
417
- $price = $showMinPrice ? $_minimalPriceValue : 0;
418
- } else {
419
- $price = $_product->getFinalPrice();
420
- $_exclTax = $_taxHelper->getPrice($_product, $price);
421
- $_inclTax = $_taxHelper->getPrice($_product, $price, true);
422
- }
423
  ?>
424
  <?php if ($price): ?>
425
  <div class="price-box">
426
  <p<?php if ($showMinPrice): ?> class="minimal-price"<?php endif ?>>
427
  <?php if ($showMinPrice): ?>
428
- <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
429
  <?php endif ?>
430
  <?php if ($_taxHelper->displayBothPrices()): ?>
431
  <span class="price-excluding-tax">
432
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
433
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
434
- <?php echo $_coreHelper->currency($_exclTax, true, false) ?>
 
435
  </span>
436
  </span>
437
  <span class="price-including-tax">
438
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
439
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
440
- <?php echo $_coreHelper->currency($_inclTax, true, false) ?>
 
441
  </span>
442
  </span>
443
  <?php else: ?>
@@ -447,8 +461,8 @@
447
  $_showPrice = $_exclTax;
448
  }
449
  ?>
450
- <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
451
- <?php echo $_coreHelper->currency($_showPrice, true, false) ?>
452
  </span>
453
  <?php endif; ?>
454
  </p>
33
  */
34
  ?>
35
  <?php
36
+ $_coreHelper = $this->helper('core');
37
+ $_weeeHelper = $this->helper('weee');
38
+ $_taxHelper = $this->helper('tax');
39
+ /* @var $_coreHelper Mage_Core_Helper_Data */
40
+ /* @var $_weeeHelper Mage_Weee_Helper_Data */
41
+ /* @var $_taxHelper Mage_Tax_Helper_Data */
42
 
43
+ $_product = $this->getProduct();
44
+ $_storeId = $_product->getStoreId();
45
+ $_store = $_product->getStore();
46
+ $_id = $_product->getId();
47
+ $_weeeSeparator = '';
48
+ $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
49
+ $_minimalPriceValue = $_product->getMinimalPrice();
50
+ $_minimalPriceValue = $_store->roundPrice($_store->convertPrice($_minimalPriceValue));
51
+ $_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);
52
+ $_convertedFinalPrice = $_store->roundPrice($_store->convertPrice($_product->getFinalPrice()));
53
+ $_specialPriceStoreLabel = $this->getProductAttribute('special_price')->getStoreLabel();
54
  ?>
55
 
56
  <?php if (!$_product->isGrouped()): ?>
57
  <?php $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product); ?>
58
+ <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true); ?>
 
 
 
59
  <?php $_weeeTaxAmountInclTaxes = $_weeeTaxAmount; ?>
60
+ <?php if ($_weeeHelper->isTaxable()): ?>
61
+ <?php $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_weeeTaxAttributes); ?>
 
62
  <?php endif; ?>
63
+ <?php $_weeeTaxAmount = $_store->roundPrice($_store->convertPrice($_weeeTaxAmount)); ?>
64
+ <?php $_weeeTaxAmountInclTaxes = $_store->roundPrice($_store->convertPrice($_weeeTaxAmountInclTaxes)); ?>
65
 
66
  <div class="price-box">
67
+ <?php $_convertedPrice = $_store->roundPrice($_store->convertPrice($_product->getPrice())); ?>
68
+ <?php $_price = $_taxHelper->getPrice($_product, $_convertedPrice); ?>
69
+ <?php $_regularPrice = $_taxHelper->getPrice($_product, $_convertedPrice, $_simplePricesTax); ?>
70
+ <?php $_finalPrice = $_taxHelper->getPrice($_product, $_convertedFinalPrice) ?>
71
+ <?php $_finalPriceInclTax = $_taxHelper->getPrice($_product, $_convertedFinalPrice, true) ?>
72
  <?php $_weeeDisplayType = $_weeeHelper->getPriceDisplayType(); ?>
73
  <?php if ($_finalPrice >= $_price): ?>
74
  <?php if ($_taxHelper->displayBothPrices()): ?>
76
  <span class="price-excluding-tax">
77
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
78
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
79
+ <?php echo $_coreHelper->formatPrice($_price + $_weeeTaxAmount, false) ?>
80
  </span>
81
  </span>
82
  <span class="price-including-tax">
83
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
84
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
85
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
86
  </span>
87
  </span>
88
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
89
  <span class="price-excluding-tax">
90
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
91
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
92
+ <?php echo $_coreHelper->formatPrice($_price + $_weeeTaxAmount, false) ?>
93
  </span>
94
  </span>
95
  <span class="weee">(
96
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
97
+ <?php echo $_weeeSeparator; ?>
98
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
99
+ <?php $_weeeSeparator = ' + '; ?>
100
  <?php endforeach; ?>
101
+ )</span>
102
  <span class="price-including-tax">
103
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
104
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
105
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
106
  </span>
107
  </span>
108
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
109
  <span class="price-excluding-tax">
110
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
111
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
112
+ <?php echo $_coreHelper->formatPrice($_price + $_weeeTaxAmount, false) ?>
113
  </span>
114
  </span>
115
  <span class="price-including-tax">
116
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
117
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
118
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
119
  </span>
120
  <span class="weee">(
121
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
129
  <span class="price-excluding-tax">
130
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
131
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
132
+ <?php echo $_coreHelper->formatPrice($_price, false) ?>
133
  </span>
134
  </span>
135
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
136
  <span class="weee">
137
+ <?php echo $_weeeTaxAttribute->getName(); ?>
138
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
139
  </span>
140
  <?php endforeach; ?>
141
  <span class="price-including-tax">
142
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
143
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
144
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
145
  </span>
146
  </span>
147
  <?php else: ?>
149
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
150
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
151
  <?php if ($_finalPrice == $_price): ?>
152
+ <?php echo $_coreHelper->formatPrice($_price, false) ?>
153
  <?php else: ?>
154
+ <?php echo $_coreHelper->formatPrice($_finalPrice, false) ?>
155
  <?php endif; ?>
156
  </span>
157
  </span>
158
  <span class="price-including-tax">
159
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
160
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
161
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax, false) ?>
162
  </span>
163
  </span>
164
  <?php endif; ?>
165
  <?php else: ?>
166
+ <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1))): // including ?>
167
+ <?php $weeeAmountToDisplay = $_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?>
168
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
169
+ <?php echo $_coreHelper->currency($_price + $weeeAmountToDisplay, true, true) ?>
170
  </span>
171
+
172
+ <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // show description ?>
173
+ <span class="weee">(
174
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
175
+ <?php echo $_weeeSeparator; ?>
176
+ <?php echo $_weeeTaxAttribute->getName(); ?>
177
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?>
178
+ <?php $_weeeSeparator = ' + '; ?>
179
+ <?php endforeach; ?>
180
+ )</span>
181
+ <?php endif; ?>
182
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
183
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
184
+ <?php echo $_coreHelper->formatPrice($_price + $_weeeTaxAmount, true) ?>
185
  </span>
186
  <span class="weee">(
187
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
191
  <?php endforeach; ?>
192
  )</span>
193
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
194
+ <span class="regular-price"><?php echo $_coreHelper->formatPrice($_price, true) ?></span><br/>
195
+ <?php $weeeAmountToDisplay = $_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?>
196
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
197
  <span class="weee">
198
+ <?php echo $_weeeTaxAttribute->getName(); ?>
199
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?>
200
  </span>
201
  <?php endforeach; ?>
202
+ <span class="regular-price"
203
+ id="product-price-weee-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
204
+ <?php echo $_coreHelper->currency($_price + $weeeAmountToDisplay, true, true) ?>
205
  </span>
206
  <?php else: ?>
207
  <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
208
  <?php if ($_finalPrice == $_price): ?>
209
+ <?php echo $_coreHelper->formatPrice($_price, true) ?>
210
  <?php else: ?>
211
+ <?php echo $_coreHelper->formatPrice($_finalPrice, true) ?>
212
  <?php endif; ?>
213
  </span>
214
  <?php endif; ?>
215
  <?php endif; ?>
216
  <?php else: /* if ($_finalPrice == $_price): */ ?>
217
  <?php $_originalWeeeTaxAmount = $_weeeHelper->getOriginalAmount($_product); ?>
218
+ <?php $_originalWeeeTaxAmount = $_store->roundPrice($_store->convertPrice($_originalWeeeTaxAmount)) ?>
219
 
220
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
221
  <p class="old-price">
222
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
223
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
224
+ <?php echo $_coreHelper->formatPrice($_regularPrice + $_originalWeeeTaxAmount, false) ?>
225
  </span>
226
  </p>
227
 
230
  <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
231
  <span class="price-excluding-tax">
232
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
233
+ <span class="price"
234
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
235
+ <?php echo $_coreHelper->formatPrice($_finalPrice + $_weeeTaxAmount, false) ?>
236
  </span>
237
  </span>
238
  <span class="price-including-tax">
239
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
240
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
241
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
242
  </span>
243
  </span>
244
  </p>
245
  <?php else: ?>
246
+ <p class="special-price">
247
+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
248
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
249
+ <?php echo $_coreHelper->formatPrice($_finalPrice + $_weeeTaxAmountInclTaxes, false) ?>
250
  </span>
251
+ </p>
252
  <?php endif; ?>
253
 
254
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
255
  <p class="old-price">
256
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
257
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
258
+ <?php echo $_coreHelper->formatPrice($_regularPrice + $_originalWeeeTaxAmount, false) ?>
259
  </span>
260
  </p>
261
 
262
+ <p class="special-price">
263
  <?php if ($_taxHelper->displayBothPrices()): ?>
264
  <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
265
  <span class="price-excluding-tax">
266
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
267
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
268
+ <?php echo $_coreHelper->formatPrice($_finalPrice + $_weeeTaxAmount, false) ?>
269
  </span>
270
  </span>
271
  <span class="weee">(
274
  <?php echo $_weeeTaxAttribute->getName(); ?>
275
  : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
276
  <?php $_weeeSeparator = ' + '; ?>
277
+ <?php endforeach; ?>
278
  )</span>
279
  <span class="price-including-tax">
280
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
281
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
282
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
283
  </span>
284
  </span>
285
  <?php else: ?>
286
  <p class="special-price">
287
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
288
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
289
+ <?php echo $_coreHelper->formatPrice($_finalPrice + $_weeeTaxAmountInclTaxes, false) ?>
290
  </span>
291
  </p>
292
  <span class="weee">(
293
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
294
+ <?php echo $_weeeSeparator; ?>
295
+ <?php echo $_weeeTaxAttribute->getName(); ?>
296
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
297
+ <?php $_weeeSeparator = ' + '; ?>
298
  <?php endforeach; ?>
299
+ )</span>
300
  <?php endif; ?>
301
+ </p>
302
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
303
  <p class="old-price">
304
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
305
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
306
+ <?php echo $_coreHelper->formatPrice($_regularPrice + $_originalWeeeTaxAmount, false) ?>
307
  </span>
308
  </p>
309
 
312
  <span class="price-excluding-tax">
313
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
314
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
315
+ <?php echo $_coreHelper->formatPrice($_finalPrice + $_weeeTaxAmount, false) ?>
316
  </span>
317
  </span>
318
  <span class="weee">(
325
  <span class="price-including-tax">
326
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
327
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
328
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
329
  </span>
330
  </span>
331
  </p>
333
  <p class="old-price">
334
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
335
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
336
+ <?php echo $_coreHelper->formatPrice($_regularPrice, false) ?>
337
  </span>
338
  </p>
339
 
342
  <span class="price-excluding-tax">
343
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
344
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
345
+ <?php echo $_coreHelper->formatPrice($_finalPrice, false) ?>
346
  </span>
347
  </span>
348
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
349
  <span class="weee">
350
+ <?php echo $_weeeTaxAttribute->getName(); ?>
351
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
352
  </span>
353
  <?php endforeach; ?>
354
  <span class="price-including-tax">
355
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
356
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
357
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, false) ?>
358
  </span>
359
  </span>
360
  </p>
362
  <p class="old-price">
363
  <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
364
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
365
+ <?php echo $_coreHelper->formatPrice($_regularPrice, false) ?>
366
  </span>
367
  </p>
368
 
371
  <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
372
  <span class="price-excluding-tax">
373
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
374
+ <span class="price"
375
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
376
+ <?php echo $_coreHelper->formatPrice($_finalPrice, false) ?>
377
  </span>
378
  </span>
379
  <span class="price-including-tax">
380
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
381
+ <span class="price"
382
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
383
+ <?php echo $_coreHelper->formatPrice($_finalPriceInclTax, false) ?>
384
  </span>
385
  </span>
386
  </p>
387
  <?php else: ?>
388
+ <p class="special-price">
389
+ <span class="price-label"><?php echo $_specialPriceStoreLabel ?></span>
390
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
391
+ <?php echo $_coreHelper->formatPrice($_finalPrice, false) ?>
392
  </span>
393
+ </p>
394
  <?php endif; ?>
395
  <?php endif; ?>
396
 
397
  <?php endif; /* if ($_finalPrice == $_price): */ ?>
398
 
399
+ <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_convertedFinalPrice): ?>
400
 
401
  <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
402
  <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))): ?>
403
  <?php $_minimalPriceDisplayValue = $_minimalPrice + $_weeeTaxAmount; ?>
404
  <?php endif; ?>
405
 
406
+ <?php if ($this->getUseLinkForAsLowAs()): ?>
407
+ <a href="<?php echo $_product->getProductUrl(); ?>" class="minimal-price-link">
408
+ <?php else: ?>
409
+ <span class="minimal-price-link">
410
+ <?php endif ?>
411
+ <span class="label"><?php echo $this->__('As low as:') ?></span>
412
+ <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
413
+ <?php echo $_coreHelper->formatPrice($_minimalPriceDisplayValue, false) ?>
414
+ </span>
415
+ <?php if ($this->getUseLinkForAsLowAs()): ?>
416
+ </a>
417
+ <?php else: ?>
418
  </span>
419
+ <?php endif ?>
 
 
 
 
420
  <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
421
  </div>
422
 
423
  <?php else: /* if (!$_product->isGrouped()): */ ?>
424
  <?php
425
+ $showMinPrice = $this->getDisplayMinimalPrice();
426
+ if ($showMinPrice && $_minimalPriceValue) {
427
+ $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
428
+ $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
429
+ $price = $showMinPrice ? $_minimalPriceValue : 0;
430
+ } else {
431
+ $price = $_convertedFinalPrice;
432
+ $_exclTax = $_taxHelper->getPrice($_product, $price);
433
+ $_inclTax = $_taxHelper->getPrice($_product, $price, true);
434
+ }
435
  ?>
436
  <?php if ($price): ?>
437
  <div class="price-box">
438
  <p<?php if ($showMinPrice): ?> class="minimal-price"<?php endif ?>>
439
  <?php if ($showMinPrice): ?>
440
+ <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
441
  <?php endif ?>
442
  <?php if ($_taxHelper->displayBothPrices()): ?>
443
  <span class="price-excluding-tax">
444
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
445
+ <span class="price"
446
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
447
+ <?php echo $_coreHelper->formatPrice($_exclTax, false) ?>
448
  </span>
449
  </span>
450
  <span class="price-including-tax">
451
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
452
+ <span class="price"
453
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
454
+ <?php echo $_coreHelper->formatPrice($_inclTax, false) ?>
455
  </span>
456
  </span>
457
  <?php else: ?>
461
  $_showPrice = $_exclTax;
462
  }
463
  ?>
464
+ <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
465
+ <?php echo $_coreHelper->formatPrice($_showPrice, false) ?>
466
  </span>
467
  <?php endif; ?>
468
  </p>
app/design/frontend/base/default/template/catalog/rss/product/price.phtml CHANGED
@@ -33,324 +33,417 @@
33
  */
34
  ?>
35
 
36
- <?php $_product = $this->getProduct() ?>
37
- <?php $_id = $_product->getId() ?>
38
- <?php if ($_product->getCanShowPrice() !== false):?>
 
 
 
 
39
 
40
- <?php $_weeeSeparator = ''; ?>
 
 
 
 
 
 
 
 
 
 
 
41
 
42
- <?php $simplePricesTax = ($this->helper('tax')->displayPriceIncludingTax() || $this->helper('tax')->displayBothPrices()); ?>
43
 
44
- <?php $_minimalPriceValue = $_product->getMinimalPrice() ?>
45
- <?php $_minimalPrice = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $simplePricesTax) ?>
46
 
47
- <?php if (!$_product->isGrouped()): ?>
48
- <?php $_weeeTaxAmount = Mage::helper('weee')->getAmountForDisplay($_product); ?>
49
- <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))): ?>
50
- <?php $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product); ?>
51
- <?php $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product); ?>
52
- <?php endif; ?>
53
 
54
- <div class="price-box">
55
- <?php $_price = $this->helper('tax')->getPrice($_product, $_product->getPrice()) ?>
56
- <?php $_regularPrice = $this->helper('tax')->getPrice($_product, $_product->getPrice(), $simplePricesTax) ?>
57
- <?php $_finalPrice = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice()) ?>
58
- <?php $_finalPriceInclTax = $this->helper('tax')->getPrice($_product, $_product->getFinalPrice(), true) ?>
59
- <?php $_weeeDisplayType = Mage::helper('weee')->getPriceDisplayType(); ?>
60
- <?php if ($_finalPrice == $_price): ?>
61
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
62
- <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
63
- <span class="price-excluding-tax">
 
 
 
 
 
 
 
 
 
 
 
 
64
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
65
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,false) ?></span>
 
66
  </span>
67
- <span class="price-including-tax">
68
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
69
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
 
70
  </span>
71
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
72
- <span class="price-excluding-tax">
73
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
74
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,false) ?></span>
75
- </span>
76
- <span class="price-including-tax">
77
- <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
78
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
79
- <br />
80
  <span class="weee">(<small>
81
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
82
- <?php echo $_weeeSeparator; ?>
83
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
84
- <?php $_weeeSeparator = ' + '; ?>
85
- <?php endforeach; ?>
86
- </small>)</span>
87
  </span>
88
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
89
- <span class="price-excluding-tax">
 
 
 
 
 
 
90
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
91
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,false) ?></span>
 
92
  </span>
93
- <span class="price-including-tax">
94
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
95
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
96
- <br />
 
97
  <span class="weee">(<small>
98
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
99
- <?php echo $_weeeSeparator; ?>
100
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
101
- <?php $_weeeSeparator = ' + '; ?>
102
- <?php endforeach; ?>
103
- </small>)</span>
104
  </span>
105
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
106
- <span class="price-excluding-tax">
107
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
108
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price,true,false) ?></span>
 
109
  </span>
110
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
111
- <span class="weee">
112
  <small>
113
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
 
114
  </small>
115
  </span>
116
- <br />
117
- <?php endforeach; ?>
118
- <span class="price-including-tax">
119
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
120
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
 
121
  </span>
122
- <?php else: ?>
123
- <span class="price-excluding-tax">
124
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
125
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price,true,false) ?></span>
 
 
 
 
 
 
126
  </span>
127
- <span class="price-including-tax">
128
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
129
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
 
130
  </span>
131
- <?php endif; ?>
132
- <?php else: ?>
133
- <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
134
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
135
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
136
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
137
- <br />
138
- <span class="weee">(<small>
139
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
140
- <?php echo $_weeeSeparator; ?>
141
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
142
- <?php $_weeeSeparator = ' + '; ?>
143
- <?php endforeach; ?>
144
- </small>)</span>
145
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
146
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
147
- <br />
148
- <span class="weee">(<small>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
149
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
150
- <?php echo $_weeeSeparator; ?>
151
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
152
- <?php $_weeeSeparator = ' + '; ?>
153
- <?php endforeach; ?>
154
- </small>)</span>
155
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
156
- <span class="regular-price"><?php echo Mage::helper('core')->currency($_price,true,true) ?></span><br />
157
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
158
- <span class="weee">
159
  <small>
160
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
 
161
  </small>
162
  </span>
163
- <br />
164
- <?php endforeach; ?>
165
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price+$_weeeTaxAmount,true,true) ?></span>
166
- <?php else: ?>
167
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price,true,true) ?></span>
 
 
 
 
 
 
 
 
168
  <?php endif; ?>
169
- <?php endif; ?>
170
- <?php else: /* if ($_finalPrice == $_price): */ ?>
171
- <?php $_originalWeeeTaxAmount = Mage::helper('weee')->getOriginalAmount($_product); ?>
172
 
173
- <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
174
- <p class="old-price">
175
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
176
- <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?></span>
177
- </p>
 
178
 
179
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
180
- <p class="special-price">
181
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
182
  <span class="price-excluding-tax">
183
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
184
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
 
185
  </span>
186
  <span class="price-including-tax">
187
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
188
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
 
189
  </span>
190
- </p>
191
- <?php else: ?>
192
- <p class="special-price">
193
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
194
- <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
195
- </p>
196
- <?php endif; ?>
 
197
 
198
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
199
- <p class="old-price">
200
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
201
- <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?></span>
202
- </p>
 
203
 
204
- <p class="special-price">
205
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
206
- <span class="price-excluding-tax">
 
 
207
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
208
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
 
209
  </span>
210
- <br />
211
- <span class="weee">(<small>
212
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
213
- <?php echo $_weeeSeparator; ?>
214
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
215
- <?php $_weeeSeparator = ' + '; ?>
216
- <?php endforeach; ?>
217
- </small>)</span>
218
- <span class="price-including-tax">
219
- <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
220
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
221
- </span>
222
- </p>
223
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
224
- <p class="old-price">
225
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
226
- <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice+$_originalWeeeTaxAmount,true,false) ?></span>
227
- </p>
228
 
229
- <p class="special-price">
230
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
231
  <span class="price-excluding-tax">
232
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
233
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice+$_weeeTaxAmount,true,false) ?></span>
 
234
  </span>
235
- <br />
236
  <span class="weee">(<small>
237
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
238
- <?php echo $_weeeSeparator; ?>
239
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(), true, true); ?>
240
- <?php $_weeeSeparator = ' + '; ?>
241
- <?php endforeach; ?>
242
- </small>)</span>
243
  <span class="price-including-tax">
244
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
245
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
 
246
  </span>
247
- </p>
248
- <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
249
- <p class="old-price">
250
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
251
- <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice,true,false) ?></span>
252
- </p>
 
253
 
254
- <p class="special-price">
255
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
256
  <span class="price-excluding-tax">
257
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
258
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
 
259
  </span>
260
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
261
- <span class="weee">
262
  <small>
263
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
 
264
  </small>
265
  </span>
266
- <br />
267
- <?php endforeach; ?>
268
- <span class="price-including-tax">
269
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
270
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax+$_weeeTaxAmount,true,false) ?></span>
 
271
  </span>
272
- </p>
273
- <?php else: // excl. ?>
274
- <p class="old-price">
275
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
276
- <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice,true,false) ?></span>
277
- </p>
 
278
 
279
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
280
- <p class="special-price">
281
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
282
  <span class="price-excluding-tax">
283
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
284
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
 
285
  </span>
286
  <span class="price-including-tax">
287
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
288
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
 
289
  </span>
290
- </p>
291
- <?php else: ?>
292
- <p class="special-price">
293
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
294
- <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
295
- </p>
 
 
296
  <?php endif; ?>
297
- <?php endif; ?>
298
 
299
- <?php endif; /* if ($_finalPrice == $_price): */ ?>
300
 
301
- <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_product->getFinalPrice()): ?>
302
 
303
- <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
304
- <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))): ?>
305
- <?php $_minimalPriceDisplayValue = $_minimalPrice+$_weeeTaxAmount; ?>
306
- <?php endif; ?>
307
 
308
- <?php if ($this->getUseLinkForAsLowAs()):?>
309
- <a href="<?php echo $_product->getProductUrl(); ?>" class="minimal-price-link">
310
- <?php else:?>
311
- <span class="minimal-price-link">
312
- <?php endif?>
313
  <span class="label"><?php echo $this->__('As low as:') ?></span>
314
- <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_minimalPriceDisplayValue,true,false) ?></span>
315
- <?php if ($this->getUseLinkForAsLowAs()):?>
316
- </a>
317
- <?php else:?>
318
- </span>
319
- <?php endif?>
320
- <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
321
- </div>
 
322
 
323
- <?php else: /* if (!$_product->isGrouped()): */ ?>
324
- <?php
325
- $_exclTax = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $includingTax = null);
326
- $_inclTax = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $includingTax = true);
327
- ?>
328
- <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
329
- <div class="price-box">
330
- <p class="minimal-price">
331
- <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
332
- <?php if ($this->helper('tax')->displayBothPrices()): ?>
333
- <span class="price-excluding-tax">
334
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
335
- <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_exclTax, true, false) ?></span>
 
336
  </span>
337
- <span class="price-including-tax">
338
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
339
- <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_inclTax, true, false) ?></span>
 
340
  </span>
341
- <?php else: ?>
342
- <?php
343
- $_showPrice = $_inclTax;
344
- if (!$this->helper('tax')->displayPriceIncludingTax()) {
345
- $_showPrice = $_exclTax;
346
- }
347
- ?>
348
- <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_showPrice, true, false) ?></span>
349
- <?php endif; ?>
350
- </p>
351
- </div>
352
- <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice): */ ?>
353
- <?php endif; /* if (!$_product->isGrouped()): */ ?>
 
354
  <?php else: ?>
355
- <?php //echo $this->helper('catalog')->__('Price is not available');?>
356
- <?php endif; /* if (!$_product->getCanShowPrice()): */?>
33
  */
34
  ?>
35
 
36
+ <?php
37
+ /* @var $_coreHelper Mage_Core_Helper_Data */
38
+ /* @var $_weeeHelper Mage_Weee_Helper_Data */
39
+ /* @var $_taxHelper Mage_Tax_Helper_Data */
40
+ $_coreHelper = $this->helper('core');
41
+ $_weeeHelper = $this->helper('weee');
42
+ $_taxHelper = $this->helper('tax');
43
 
44
+ $_product = $this->getProduct();
45
+ $_storeId = $_product->getStoreId();
46
+ $_store = $_product->getStore();
47
+ $_id = $_product->getId();
48
+ $_weeeSeparator = '';
49
+ $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
50
+ $_minimalPriceValue = $_product->getMinimalPrice();
51
+ $_minimalPriceValue = $_store->roundPrice($_store->convertPrice($_minimalPriceValue));
52
+ $_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);
53
+ $_convertedFinalPrice = $_store->roundPrice($_store->convertPrice($_product->getFinalPrice()));
54
+ $_specialPriceStoreLabel = $this->getProductAttribute('special_price')->getStoreLabel();
55
+ ?>
56
 
57
+ <?php if ($_product->getCanShowPrice() !== false): ?>
58
 
59
+ <?php $_weeeSeparator = ''; ?>
 
60
 
 
 
 
 
 
 
61
 
62
+ <?php if (!$_product->isGrouped()): ?>
63
+ <?php $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product); ?>
64
+ <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true); ?>
65
+ <?php $_weeeTaxAmountInclTaxes = $_weeeTaxAmount; ?>
66
+ <?php if ($_weeeHelper->isTaxable()): ?>
67
+ <?php $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_weeeTaxAttributes); ?>
68
+ <?php endif; ?>
69
+ <?php $_weeeTaxAmount = $_store->roundPrice($_store->convertPrice($_weeeTaxAmount)); ?>
70
+ <?php $_weeeTaxAmountInclTaxes = $_store->roundPrice($_store->convertPrice($_weeeTaxAmountInclTaxes)); ?>
71
+
72
+ <div class="price-box">
73
+ <?php $_convertedPrice = $_store->roundPrice($_store->convertPrice($_product->getPrice())); ?>
74
+ <?php $_price = $_taxHelper->getPrice($_product, $_convertedPrice); ?>
75
+ <?php $_regularPrice = $_taxHelper->getPrice($_product, $_convertedPrice, $_simplePricesTax); ?>
76
+ <?php $_finalPrice = $_taxHelper->getPrice($_product, $_convertedFinalPrice) ?>
77
+ <?php $_finalPriceInclTax = $_taxHelper->getPrice($_product, $_convertedFinalPrice, true) ?>
78
+ <?php $_weeeDisplayType = $_weeeHelper->getPriceDisplayType(); ?>
79
+
80
+ <?php if ($_finalPrice == $_price): ?>
81
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
82
+ <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
83
+ <span class="price-excluding-tax">
84
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
85
+ <span class="price"
86
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price + $_weeeTaxAmount, true, false) ?></span>
87
  </span>
88
+ <span class="price-including-tax">
89
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
90
+ <span class="price"
91
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?></span>
92
  </span>
93
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
94
+ <span class="price-excluding-tax">
95
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
96
+ <span class="price"
97
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price + $_weeeTaxAmount, true, false) ?></span>
98
+ <br/>
 
 
 
99
  <span class="weee">(<small>
100
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
101
+ <?php echo $_weeeSeparator; ?>
102
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
103
+ <?php $_weeeSeparator = ' + '; ?>
104
+ <?php endforeach; ?>
105
+ </small>)</span>
106
  </span>
107
+ <span class="price-including-tax">
108
+ <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
109
+ <span class="price"
110
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?></span>
111
+ </span>
112
+
113
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
114
+ <span class="price-excluding-tax">
115
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
116
+ <span class="price"
117
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price + $_weeeTaxAmount, true, false) ?></span>
118
  </span>
119
+ <span class="price-including-tax">
120
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
121
+ <span class="price"
122
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?></span>
123
+ <br/>
124
  <span class="weee">(<small>
125
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
126
+ <?php echo $_weeeSeparator; ?>
127
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
128
+ <?php $_weeeSeparator = ' + '; ?>
129
+ <?php endforeach; ?>
130
+ </small>)</span>
131
  </span>
132
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
133
+ <span class="price-excluding-tax">
134
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
135
+ <span class="price"
136
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price, true, false) ?></span>
137
  </span>
138
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
139
+ <span class="weee">
140
  <small>
141
+ <?php echo $_weeeTaxAttribute->getName(); ?>
142
+ : <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
143
  </small>
144
  </span>
145
+ <br/>
146
+ <?php endforeach; ?>
147
+ <span class="price-including-tax">
148
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
149
+ <span class="price"
150
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?></span>
151
  </span>
152
+ <?php else: ?>
153
+ <span class="price-excluding-tax">
154
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
155
+ <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
156
+ <?php if ($_finalPrice == $_price): ?>
157
+ <?php echo $_coreHelper->formatPrice($_price, false) ?>
158
+ <?php else: ?>
159
+ <?php echo $_coreHelper->formatPrice($_finalPrice, false) ?>
160
+ <?php endif; ?>
161
+ </span>
162
  </span>
163
+ <span class="price-including-tax">
164
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
165
+ <span class="price"
166
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax, true, false) ?></span>
167
  </span>
168
+ <?php endif; ?>
169
+ <?php else: ?>
170
+ <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
171
+ <?php $weeeAmountToDisplay = $_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?>
172
+ <span class="regular-price"
173
+ id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price + $weeeAmountToDisplay, true, true) ?></span>
174
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
175
+ <?php $weeeAmountToDisplay = $_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?>
176
+ <span class="regular-price"
177
+ id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price + $weeeAmountToDisplay, true, true) ?></span>
178
+ <br/>
179
+ <span class="weee">(<small>
180
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
181
+ <?php echo $_weeeSeparator; ?>
182
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?>
183
+ <?php $_weeeSeparator = ' + '; ?>
184
+ <?php endforeach; ?>
185
+ </small>)</span>
186
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
187
+ <span class="regular-price"
188
+ id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price + $_weeeTaxAmount, true, true) ?></span>
189
+ <br/>
190
+ <span class="weee">(<small>
191
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
192
+ <?php echo $_weeeSeparator; ?>
193
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
194
+ <?php $_weeeSeparator = ' + '; ?>
195
+ <?php endforeach; ?>
196
+ </small>)</span>
197
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
198
+ <?php $weeeAmountToDisplay = $_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?>
199
+ <span class="regular-price"><?php echo Mage::helper('core')->currency($_price, true, true) ?></span>
200
+ <br/>
201
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
202
+ <span class="weee">
 
 
 
 
 
 
 
 
203
  <small>
204
+ <?php echo $_weeeTaxAttribute->getName(); ?>
205
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?>
206
  </small>
207
  </span>
208
+ <br/>
209
+ <?php endforeach; ?>
210
+ <span class="regular-price"
211
+ id="product-price-weee-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_price + $weeeAmountToDisplay, true, true) ?></span>
212
+ <?php else: ?>
213
+ <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
214
+ <?php if ($_finalPrice == $_price): ?>
215
+ <?php echo $_coreHelper->formatPrice($_price, true) ?>
216
+ <?php else: ?>
217
+ <?php echo $_coreHelper->formatPrice($_finalPrice, true) ?>
218
+ <?php endif; ?>
219
+ </span>
220
+ <?php endif; ?>
221
  <?php endif; ?>
222
+ <?php else: /* if ($_finalPrice == $_price): */ ?>
223
+ <?php $_originalWeeeTaxAmount = $_weeeHelper->getOriginalAmount($_product); ?>
224
+ <?php $_originalWeeeTaxAmount = $_store->roundPrice($_store->convertPrice($_originalWeeeTaxAmount)) ?>
225
 
226
+ <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 0)): // including ?>
227
+ <p class="old-price">
228
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
229
+ <span class="price"
230
+ id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?></span>
231
+ </p>
232
 
233
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
234
+ <p class="special-price">
235
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
236
  <span class="price-excluding-tax">
237
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
238
+ <span class="price"
239
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice + $_weeeTaxAmount, true, false) ?></span>
240
  </span>
241
  <span class="price-including-tax">
242
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
243
+ <span class="price"
244
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?></span>
245
  </span>
246
+ </p>
247
+ <?php else: ?>
248
+ <p class="special-price">
249
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
250
+ <span class="price"
251
+ id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?></span>
252
+ </p>
253
+ <?php endif; ?>
254
 
255
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 1)): // incl. + weee ?>
256
+ <p class="old-price">
257
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
258
+ <span class="price"
259
+ id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?></span>
260
+ </p>
261
 
262
+ <p class="special-price">
263
  <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
264
+ <?php if ($_taxHelper->displayBothPrices()): ?>
265
+
266
+ <span class="price-excluding-tax">
267
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
268
+ <span class="price"
269
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice + $_weeeTaxAmount, true, false) ?></span>
270
  </span>
271
+ <br/>
272
+ <span class="weee">(
273
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
274
+ <?php echo $_weeeSeparator; ?>
275
+ <?php echo $_weeeTaxAttribute->getName(); ?>
276
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
277
+ <?php $_weeeSeparator = ' + '; ?>
278
+ <?php endforeach; ?>
279
+ )</span>
 
 
 
 
 
 
 
 
 
280
 
281
+ <span class="price-including-tax">
282
+ <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
283
+ <span class="price"
284
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?></span>
285
+ </span>
286
+ <?php else: ?>
287
+ <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
288
+ <?php echo $_coreHelper->formatPrice($_finalPrice + $_weeeTaxAmountInclTaxes, false) ?>
289
+ </span>
290
+ </p>
291
+ <span class="weee">(
292
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
293
+ <?php echo $_weeeSeparator; ?>
294
+ <?php echo $_weeeTaxAttribute->getName(); ?>
295
+ : <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
296
+ <?php $_weeeSeparator = ' + '; ?>
297
+ <?php endforeach; ?>
298
+ )</span>
299
+
300
+ <?php endif; ?>
301
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 4)): // incl. + weee ?>
302
+ <p class="old-price">
303
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
304
+ <span class="price"
305
+ id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?></span>
306
+ </p>
307
+
308
+ <p class="special-price">
309
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
310
  <span class="price-excluding-tax">
311
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
312
+ <span class="price"
313
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice + $_weeeTaxAmount, true, false) ?></span>
314
  </span>
315
+ <br/>
316
  <span class="weee">(<small>
317
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
318
+ <?php echo $_weeeSeparator; ?>
319
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
320
+ <?php $_weeeSeparator = ' + '; ?>
321
+ <?php endforeach; ?>
322
+ </small>)</span>
323
  <span class="price-including-tax">
324
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
325
+ <span class="price"
326
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmount, true, false) ?></span>
327
  </span>
328
+ </p>
329
+ <?php elseif ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
330
+ <p class="old-price">
331
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
332
+ <span class="price"
333
+ id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice, true, false) ?></span>
334
+ </p>
335
 
336
+ <p class="special-price">
337
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
338
  <span class="price-excluding-tax">
339
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
340
+ <span class="price"
341
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice, true, false) ?></span>
342
  </span>
343
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
344
+ <span class="weee">
345
  <small>
346
+ <?php echo $_weeeTaxAttribute->getName(); ?>
347
+ : <?php echo Mage::helper('core')->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
348
  </small>
349
  </span>
350
+ <br/>
351
+ <?php endforeach; ?>
352
+ <span class="price-including-tax">
353
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
354
+ <span class="price"
355
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?></span>
356
  </span>
357
+ </p>
358
+ <?php else: // excl. ?>
359
+ <p class="old-price">
360
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
361
+ <span class="price"
362
+ id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_regularPrice, true, false) ?></span>
363
+ </p>
364
 
365
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
366
+ <p class="special-price">
367
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
368
  <span class="price-excluding-tax">
369
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
370
+ <span class="price"
371
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice, true, false) ?></span>
372
  </span>
373
  <span class="price-including-tax">
374
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
375
+ <span class="price"
376
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax, true, false) ?></span>
377
  </span>
378
+ </p>
379
+ <?php else: ?>
380
+ <p class="special-price">
381
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
382
+ <span class="price"
383
+ id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice, true, false) ?></span>
384
+ </p>
385
+ <?php endif; ?>
386
  <?php endif; ?>
 
387
 
388
+ <?php endif; /* if ($_finalPrice == $_price): */ ?>
389
 
390
+ <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_product->getFinalPrice()): ?>
391
 
392
+ <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
393
+ <?php if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))): ?>
394
+ <?php $_minimalPriceDisplayValue = $_minimalPrice + $_weeeTaxAmount; ?>
395
+ <?php endif; ?>
396
 
397
+ <?php if ($this->getUseLinkForAsLowAs()): ?>
398
+ <a href="<?php echo $_product->getProductUrl(); ?>" class="minimal-price-link">
399
+ <?php else: ?>
400
+ <span class="minimal-price-link">
401
+ <?php endif ?>
402
  <span class="label"><?php echo $this->__('As low as:') ?></span>
403
+ <span class="price"
404
+ id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_minimalPriceDisplayValue, true, false) ?></span>
405
+ <?php if ($this->getUseLinkForAsLowAs()): ?>
406
+ </a>
407
+ <?php else: ?>
408
+ </span>
409
+ <?php endif ?>
410
+ <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
411
+ </div>
412
 
413
+ <?php else: /* if (!$_product->isGrouped()): */ ?>
414
+ <?php
415
+ $_exclTax = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $includingTax = null);
416
+ $_inclTax = $this->helper('tax')->getPrice($_product, $_minimalPriceValue, $includingTax = true);
417
+ ?>
418
+ <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
419
+ <div class="price-box">
420
+ <p class="minimal-price">
421
+ <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
422
+ <?php if ($this->helper('tax')->displayBothPrices()): ?>
423
+ <span class="price-excluding-tax">
424
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
425
+ <span class="price"
426
+ id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_exclTax, true, false) ?></span>
427
  </span>
428
+ <span class="price-including-tax">
429
  <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
430
+ <span class="price"
431
+ id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_inclTax, true, false) ?></span>
432
  </span>
433
+ <?php else: ?>
434
+ <?php
435
+ $_showPrice = $_inclTax;
436
+ if (!$this->helper('tax')->displayPriceIncludingTax()) {
437
+ $_showPrice = $_exclTax;
438
+ }
439
+ ?>
440
+ <span class="price"
441
+ id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_showPrice, true, false) ?></span>
442
+ <?php endif; ?>
443
+ </p>
444
+ </div>
445
+ <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice): */ ?>
446
+ <?php endif; /* if (!$_product->isGrouped()): */ ?>
447
  <?php else: ?>
448
+ <?php //echo $this->helper('catalog')->__('Price is not available');?>
449
+ <?php endif; /* if (!$_product->getCanShowPrice()): */ ?>
app/design/frontend/base/default/template/checkout/cart.phtml CHANGED
@@ -47,6 +47,7 @@
47
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
48
  <?php echo $this->getChildHtml('form_before') ?>
49
  <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post">
 
50
  <fieldset>
51
  <table id="shopping-cart-table" class="data-table cart-table">
52
  <col width="1" />
47
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
48
  <?php echo $this->getChildHtml('form_before') ?>
49
  <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post">
50
+ <?php echo $this->getBlockHtml('formkey'); ?>
51
  <fieldset>
52
  <table id="shopping-cart-table" class="data-table cart-table">
53
  <col width="1" />
app/design/frontend/base/default/template/checkout/cart/item/default.phtml CHANGED
@@ -108,7 +108,6 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
108
 
109
  </span>
110
 
111
-
112
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
113
 
114
  <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
@@ -118,11 +117,11 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
118
  <?php endforeach; ?>
119
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
120
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
121
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
122
  <?php endforeach; ?>
123
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
124
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
125
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
126
  <?php endforeach; ?>
127
  <?php endif; ?>
128
  </div>
@@ -134,7 +133,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
134
  <?php endif; ?>
135
  <?php endif; ?>
136
  </td>
137
- <?php endif; ?>
138
  <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
139
  <td>
140
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
@@ -145,7 +144,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
145
  <?php endif; ?>
146
 
147
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
148
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
149
  <?php else: ?>
150
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
151
  <?php endif; ?>
@@ -156,7 +155,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
156
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
157
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
158
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
159
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
160
  <?php endforeach; ?>
161
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
162
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
@@ -171,7 +170,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
171
 
172
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
173
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
174
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
175
  </div>
176
  <?php endif; ?>
177
  <?php endif; ?>
@@ -181,6 +180,8 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
181
  <td class="a-center">
182
  <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
183
  </td>
 
 
184
  <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
185
  <td class="a-right">
186
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -209,11 +210,11 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
209
  <?php endforeach; ?>
210
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
211
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
212
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
213
  <?php endforeach; ?>
214
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
215
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
216
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
217
  <?php endforeach; ?>
218
  <?php endif; ?>
219
  </div>
@@ -239,7 +240,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
239
  <span class="cart-msrp-subtotal">--</span>
240
  <?php else: ?>
241
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
242
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
243
  <?php else: ?>
244
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
245
  <?php endif; ?>
@@ -253,7 +254,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
253
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
254
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
255
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
256
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
257
  <?php endforeach; ?>
258
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
259
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
@@ -268,7 +269,7 @@ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage
268
 
269
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
270
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
271
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
272
  </div>
273
  <?php endif; ?>
274
  <?php endif; ?>
108
 
109
  </span>
110
 
 
111
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
112
 
113
  <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
117
  <?php endforeach; ?>
118
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
119
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
120
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
121
  <?php endforeach; ?>
122
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
123
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
125
  <?php endforeach; ?>
126
  <?php endif; ?>
127
  </div>
133
  <?php endif; ?>
134
  <?php endif; ?>
135
  </td>
136
+ <?php endif; ?><!-- inclusive price starts here -->
137
  <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
138
  <td>
139
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
144
  <?php endif; ?>
145
 
146
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
147
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
148
  <?php else: ?>
149
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
150
  <?php endif; ?>
155
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
156
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
157
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
158
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
159
  <?php endforeach; ?>
160
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
161
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
170
 
171
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
172
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
173
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
174
  </div>
175
  <?php endif; ?>
176
  <?php endif; ?>
180
  <td class="a-center">
181
  <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
182
  </td>
183
+
184
+ <!--Sub total starts here -->
185
  <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
186
  <td class="a-right">
187
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
210
  <?php endforeach; ?>
211
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
212
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
213
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
214
  <?php endforeach; ?>
215
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
216
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
217
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
218
  <?php endforeach; ?>
219
  <?php endif; ?>
220
  </div>
240
  <span class="cart-msrp-subtotal">--</span>
241
  <?php else: ?>
242
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
243
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
244
  <?php else: ?>
245
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
246
  <?php endif; ?>
254
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
255
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
256
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
257
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
258
  <?php endforeach; ?>
259
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
260
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
269
 
270
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
271
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
272
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
273
  </div>
274
  <?php endif; ?>
275
  <?php endif; ?>
app/design/frontend/base/default/template/checkout/cart/sidebar/default.phtml CHANGED
@@ -91,7 +91,7 @@
91
  <br /><?php echo $this->__('Incl. Tax'); ?>:
92
  <?php endif; ?>
93
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
94
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
95
  <?php else: ?>
96
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
97
  <?php endif; ?>
@@ -115,7 +115,7 @@
115
  </small>
116
  <?php endif; ?>
117
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
118
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
119
  <?php endif; ?>
120
  <?php endif; ?>
121
  <?php endif; ?>
91
  <br /><?php echo $this->__('Incl. Tax'); ?>:
92
  <?php endif; ?>
93
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
94
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
95
  <?php else: ?>
96
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
97
  <?php endif; ?>
115
  </small>
116
  <?php endif; ?>
117
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
118
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
119
  <?php endif; ?>
120
  <?php endif; ?>
121
  <?php endif; ?>
app/design/frontend/base/default/template/checkout/multishipping/overview.phtml CHANGED
@@ -31,6 +31,7 @@
31
  </div>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" onsubmit="return showLoader();">
 
34
  <div class="col2-set">
35
  <h2 class="legend"><?php echo $this->__('Billing Information') ?></h2>
36
  <div class="col-1">
31
  </div>
32
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" onsubmit="return showLoader();">
34
+ <?php echo $this->getBlockHtml('formkey'); ?>
35
  <div class="col2-set">
36
  <h2 class="legend"><?php echo $this->__('Billing Information') ?></h2>
37
  <div class="col-1">
app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml CHANGED
@@ -64,12 +64,12 @@
64
  </small>
65
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
66
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
68
  <?php endforeach; ?>
69
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
70
  <small>
71
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
73
  <?php endforeach; ?>
74
  </small>
75
  <?php endif; ?>
@@ -96,7 +96,7 @@
96
  <?php endif; ?>
97
 
98
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
99
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
100
  <?php else: ?>
101
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
102
  <?php endif; ?>
@@ -108,7 +108,7 @@
108
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
109
  <small>
110
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
112
  <?php endforeach; ?>
113
  </small>
114
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -126,7 +126,7 @@
126
 
127
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
128
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
129
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
130
  </div>
131
  <?php endif; ?>
132
  <?php endif; ?>
@@ -164,12 +164,12 @@
164
  </small>
165
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
166
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
167
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
168
  <?php endforeach; ?>
169
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
170
  <small>
171
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
172
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
173
  <?php endforeach; ?>
174
  </small>
175
  <?php endif; ?>
@@ -196,7 +196,7 @@
196
  <?php endif; ?>
197
 
198
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
199
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
200
  <?php else: ?>
201
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
202
  <?php endif; ?>
@@ -210,7 +210,7 @@
210
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
211
  <small>
212
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
213
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
214
  <?php endforeach; ?>
215
  </small>
216
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -228,7 +228,7 @@
228
 
229
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
230
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
231
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
232
  </div>
233
  <?php endif; ?>
234
  <?php endif; ?>
64
  </small>
65
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
66
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></small></span><br />
68
  <?php endforeach; ?>
69
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
70
  <small>
71
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
73
  <?php endforeach; ?>
74
  </small>
75
  <?php endif; ?>
96
  <?php endif; ?>
97
 
98
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
99
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
100
  <?php else: ?>
101
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
102
  <?php endif; ?>
108
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
109
  <small>
110
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
112
  <?php endforeach; ?>
113
  </small>
114
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
126
 
127
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
128
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
129
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
130
  </div>
131
  <?php endif; ?>
132
  <?php endif; ?>
164
  </small>
165
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
166
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
167
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
168
  <?php endforeach; ?>
169
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
170
  <small>
171
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
172
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
173
  <?php endforeach; ?>
174
  </small>
175
  <?php endif; ?>
196
  <?php endif; ?>
197
 
198
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
199
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
200
  <?php else: ?>
201
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
202
  <?php endif; ?>
210
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
211
  <small>
212
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
213
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
214
  <?php endforeach; ?>
215
  </small>
216
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
228
 
229
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
230
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
231
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
232
  </div>
233
  <?php endif; ?>
234
  <?php endif; ?>
app/design/frontend/base/default/template/checkout/onepage/login.phtml CHANGED
@@ -66,6 +66,7 @@
66
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
67
  <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
68
  <fieldset>
 
69
  <h4><?php echo $this->__('Already registered?') ?></h4>
70
  <p><?php echo $this->__('Please log in below:') ?></p>
71
  <ul class="form-list">
66
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
67
  <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
68
  <fieldset>
69
+ <?php echo $this->getBlockHtml('formkey'); ?>
70
  <h4><?php echo $this->__('Already registered?') ?></h4>
71
  <p><?php echo $this->__('Please log in below:') ?></p>
72
  <ul class="form-list">
app/design/frontend/base/default/template/checkout/onepage/review/item.phtml CHANGED
@@ -77,12 +77,12 @@
77
  </small>
78
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
79
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
80
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
81
  <?php endforeach; ?>
82
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
83
  <small>
84
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
85
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
86
  <?php endforeach; ?>
87
  </small>
88
  <?php endif; ?>
@@ -106,7 +106,7 @@
106
  <?php endif; ?>
107
 
108
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
109
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
110
  <?php else: ?>
111
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
112
  <?php endif; ?>
@@ -118,7 +118,7 @@
118
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
119
  <small>
120
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
121
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
122
  <?php endforeach; ?>
123
  </small>
124
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -136,13 +136,14 @@
136
 
137
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
138
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
139
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
140
  </div>
141
  <?php endif; ?>
142
  <?php endif; ?>
143
  </td>
144
  <?php endif; ?>
145
  <td class="a-center"><?php echo $_item->getQty() ?></td>
 
146
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
147
  <td class="a-right">
148
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -169,12 +170,12 @@
169
  </small>
170
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
171
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
172
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
173
  <?php endforeach; ?>
174
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
175
  <small>
176
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
177
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
178
  <?php endforeach; ?>
179
  </small>
180
  <?php endif; ?>
@@ -198,7 +199,7 @@
198
  <?php endif; ?>
199
 
200
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
201
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
202
  <?php else: ?>
203
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
204
  <?php endif; ?>
@@ -212,7 +213,7 @@
212
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
213
  <small>
214
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
216
  <?php endforeach; ?>
217
  </small>
218
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -230,7 +231,7 @@
230
 
231
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
232
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
233
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
234
  </div>
235
  <?php endif; ?>
236
  <?php endif; ?>
77
  </small>
78
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
79
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
80
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></small></span><br />
81
  <?php endforeach; ?>
82
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
83
  <small>
84
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
85
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
86
  <?php endforeach; ?>
87
  </small>
88
  <?php endif; ?>
106
  <?php endif; ?>
107
 
108
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
109
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
110
  <?php else: ?>
111
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
112
  <?php endif; ?>
118
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
119
  <small>
120
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
121
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
122
  <?php endforeach; ?>
123
  </small>
124
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
136
 
137
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
138
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
139
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
140
  </div>
141
  <?php endif; ?>
142
  <?php endif; ?>
143
  </td>
144
  <?php endif; ?>
145
  <td class="a-center"><?php echo $_item->getQty() ?></td>
146
+ <!-- sub total starts here -->
147
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
148
  <td class="a-right">
149
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
170
  </small>
171
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
172
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
173
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
174
  <?php endforeach; ?>
175
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
176
  <small>
177
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
178
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
179
  <?php endforeach; ?>
180
  </small>
181
  <?php endif; ?>
199
  <?php endif; ?>
200
 
201
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
202
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
203
  <?php else: ?>
204
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
205
  <?php endif; ?>
213
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
214
  <small>
215
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
216
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
217
  <?php endforeach; ?>
218
  </small>
219
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
231
 
232
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
233
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
234
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
235
  </div>
236
  <?php endif; ?>
237
  <?php endif; ?>
app/design/frontend/base/default/template/customer/form/login.phtml CHANGED
@@ -39,6 +39,7 @@
39
  <?php /* Extensions placeholder */ ?>
40
  <?php echo $this->getChildHtml('customer.form.login.extra')?>
41
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
 
42
  <div class="col2-set">
43
  <div class="col-1 new-users">
44
  <div class="content">
39
  <?php /* Extensions placeholder */ ?>
40
  <?php echo $this->getChildHtml('customer.form.login.extra')?>
41
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
42
+ <?php echo $this->getBlockHtml('formkey'); ?>
43
  <div class="col2-set">
44
  <div class="col-1 new-users">
45
  <div class="content">
app/design/frontend/base/default/template/downloadable/checkout/cart/item/default.phtml CHANGED
@@ -25,64 +25,72 @@
25
  */
26
  ?>
27
  <?php
28
- $_item = $this->getItem();
29
- $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
30
  ?>
31
  <tr>
32
- <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image" title="<?php echo $this->escapeHtml($this->getProductName()) ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a></td>
33
- <td>
34
- <h2 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h2>
35
- <?php if ($_options = $this->getOptionList()):?>
 
 
 
 
 
36
  <dl class="item-options">
37
  <?php foreach ($_options as $_option) : ?>
38
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
39
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
40
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
41
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
42
- <div class="truncated_full_value">
43
- <dl class="item-options">
44
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
45
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
46
- </dl>
47
- </div>
48
- <?php endif; ?>
49
- </dd>
50
  <?php endforeach; ?>
51
  </dl>
52
- <?php endif;?>
53
- <!-- downloadable -->
54
- <?php if ($links = $this->getLinks()): ?>
55
  <dl class="item-options">
56
  <dt><?php echo $this->getLinksTitle() ?></dt>
57
  <?php foreach ($links as $link): ?>
58
  <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
59
  <?php endforeach; ?>
60
  </dl>
61
- <?php endif; ?>
62
- <!-- EOF downloadable -->
63
 
64
- <?php if ($messages = $this->getMessages()): ?>
65
  <?php foreach ($messages as $message): ?>
66
- <div class="shopping-cart-item-message <?php echo $message['type'] ?>">
67
- * <?php echo $this->escapeHtml($message['text']) ?>
68
- </div>
69
  <?php endforeach; ?>
70
- <?php endif; ?>
71
- </td>
72
- <td class="a-center">
73
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
74
- </td>
75
- <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
 
76
  <td class="a-center">
77
- <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist"><?php echo $this->__('Move'); ?></a>
 
78
  </td>
79
- <?php endif ?>
80
  <?php if ($canApplyMsrp): ?>
81
  <td class="a-right"<?php if ($this->helper('tax')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
82
  <span class="cart-price">
83
  <span class="cart-msrp-unit"><?php echo $this->__('See price before order confirmation.'); ?></span>
84
  <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
85
- <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
 
86
  <script type="text/javascript">
87
  Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo $this->__("What's this?") ?>");
88
  </script>
@@ -92,186 +100,216 @@
92
 
93
 
94
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
95
- <td class="a-right">
96
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
97
- <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
98
- <?php else: ?>
99
- <div class="cart-price">
100
- <?php endif; ?>
 
101
 
102
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
103
- <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
104
- <?php else: ?>
105
- <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
106
- <?php endif; ?>
107
 
108
- </div>
109
 
110
 
111
- <?php if (Mage::helper('weee')->getApplied($_item)): ?>
112
 
113
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
114
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
115
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
116
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
117
- <?php endforeach; ?>
118
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
119
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
120
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
121
- <?php endforeach; ?>
122
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
123
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
125
- <?php endforeach; ?>
126
- <?php endif; ?>
127
- </div>
 
 
 
 
128
 
129
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
130
- <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
131
- <span class="weee"><?php echo Mage::helper('weee')->__('Total'); ?>: <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
132
- </div>
133
- <?php endif; ?>
134
- <?php endif; ?>
135
- </td>
 
 
136
  <?php endif; ?>
137
  <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
138
- <td>
139
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
140
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
141
- <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
142
- <?php else: ?>
143
- <div class="cart-price">
144
- <?php endif; ?>
 
145
 
146
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
147
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
148
- <?php else: ?>
149
- <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
150
- <?php endif; ?>
151
 
152
- </div>
153
- <?php if (Mage::helper('weee')->getApplied($_item)): ?>
154
 
155
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
156
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
157
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
158
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
159
- <?php endforeach; ?>
160
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
161
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
162
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
163
- <?php endforeach; ?>
164
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
165
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
166
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
167
- <?php endforeach; ?>
168
- <?php endif; ?>
169
- </div>
 
 
 
 
170
 
171
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
172
- <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
173
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
174
- </div>
175
- <?php endif; ?>
176
- <?php endif; ?>
177
- </td>
 
 
178
  <?php endif; ?>
179
  <?php endif; ?>
180
- <td class="a-center">
181
- <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12" />
182
- </td>
183
- <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
 
184
  <td class="a-right">
185
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
186
- <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
187
- <?php else: ?>
188
- <div class="cart-price">
189
- <?php endif; ?>
190
-
191
- <?php if ($canApplyMsrp): ?>
192
- <span class="cart-msrp-subtotal">--</span>
193
- <?php else: ?>
194
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
195
- <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
196
  <?php else: ?>
197
- <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
198
- <?php endif; ?>
199
- <?php endif; ?>
200
-
201
- </div>
202
- <?php if (Mage::helper('weee')->getApplied($_item)): ?>
203
 
204
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
205
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
206
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
207
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
208
- <?php endforeach; ?>
209
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
210
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
211
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
212
- <?php endforeach; ?>
213
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
214
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
216
- <?php endforeach; ?>
217
  <?php endif; ?>
 
218
  </div>
 
219
 
220
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
221
- <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
222
- <span class="weee"><?php echo Mage::helper('weee')->__('Total'); ?>: <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
223
  </div>
 
 
 
 
 
 
 
 
224
  <?php endif; ?>
225
- <?php endif; ?>
226
  </td>
227
- <?php endif; ?>
228
- <?php if (($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
229
  <td>
230
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
231
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
232
- <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
233
- <?php else: ?>
234
- <div class="cart-price">
235
- <?php endif; ?>
236
-
237
- <?php if ($canApplyMsrp): ?>
238
- <span class="cart-msrp-subtotal">--</span>
239
- <?php else: ?>
240
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
241
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
242
  <?php else: ?>
243
- <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
244
- <?php endif; ?>
245
- <?php endif; ?>
246
 
247
- </div>
 
 
 
 
 
 
 
 
248
 
 
249
 
250
- <?php if (Mage::helper('weee')->getApplied($_item)): ?>
251
 
252
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
253
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
254
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
255
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
256
- <?php endforeach; ?>
257
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
258
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
259
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
260
- <?php endforeach; ?>
261
- <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
262
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
263
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
264
- <?php endforeach; ?>
265
- <?php endif; ?>
266
- </div>
267
 
268
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
269
- <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
270
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
271
  </div>
 
 
 
 
 
 
 
 
272
  <?php endif; ?>
273
- <?php endif; ?>
274
  </td>
275
- <?php endif; ?>
276
- <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove Item')?>" class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
 
277
  </tr>
25
  */
26
  ?>
27
  <?php
28
+ $_item = $this->getItem();
29
+ $canApplyMsrp = Mage::helper('catalog')->canApplyMsrp($_item->getProduct(), Mage_Catalog_Model_Product_Attribute_Source_Msrp_Type::TYPE_BEFORE_ORDER_CONFIRM);
30
  ?>
31
  <tr>
32
+ <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image"
33
+ title="<?php echo $this->escapeHtml($this->getProductName()) ?>"><img
34
+ src="<?php echo $this->getProductThumbnail()->resize(75); ?>"
35
+ alt="<?php echo $this->escapeHtml($this->getProductName()) ?>"/></a></td>
36
+ <td>
37
+ <h2 class="product-name"><a
38
+ href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
39
+ </h2>
40
+ <?php if ($_options = $this->getOptionList()): ?>
41
  <dl class="item-options">
42
  <?php foreach ($_options as $_option) : ?>
43
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
44
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
45
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
46
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
47
+ <div class="truncated_full_value">
48
+ <dl class="item-options">
49
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
50
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
51
+ </dl>
52
+ </div>
53
+ <?php endif; ?>
54
+ </dd>
55
  <?php endforeach; ?>
56
  </dl>
57
+ <?php endif; ?>
58
+ <!-- downloadable -->
59
+ <?php if ($links = $this->getLinks()): ?>
60
  <dl class="item-options">
61
  <dt><?php echo $this->getLinksTitle() ?></dt>
62
  <?php foreach ($links as $link): ?>
63
  <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
64
  <?php endforeach; ?>
65
  </dl>
66
+ <?php endif; ?>
67
+ <!-- EOF downloadable -->
68
 
69
+ <?php if ($messages = $this->getMessages()): ?>
70
  <?php foreach ($messages as $message): ?>
71
+ <div class="shopping-cart-item-message <?php echo $message['type'] ?>">
72
+ * <?php echo $this->escapeHtml($message['text']) ?>
73
+ </div>
74
  <?php endforeach; ?>
75
+ <?php endif; ?>
76
+ </td>
77
+ <td class="a-center">
78
+ <a href="<?php echo $this->getConfigureUrl() ?>"
79
+ title="<?php echo $this->__('Edit item parameters') ?>"><?php echo $this->__('Edit') ?></a>
80
+ </td>
81
+ <?php if ($this->helper('wishlist')->isAllowInCart()) : ?>
82
  <td class="a-center">
83
+ <a href="<?php echo $this->helper('wishlist')->getMoveFromCartUrl($_item->getId()); ?>"
84
+ class="link-wishlist"><?php echo $this->__('Move'); ?></a>
85
  </td>
86
+ <?php endif ?>
87
  <?php if ($canApplyMsrp): ?>
88
  <td class="a-right"<?php if ($this->helper('tax')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
89
  <span class="cart-price">
90
  <span class="cart-msrp-unit"><?php echo $this->__('See price before order confirmation.'); ?></span>
91
  <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
92
+ <a id="<?php echo $helpLinkId ?>" href="#"
93
+ class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
94
  <script type="text/javascript">
95
  Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo $this->__("What's this?") ?>");
96
  </script>
100
 
101
 
102
  <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
103
+ <td class="a-right">
104
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
105
+ <div class="cart-tax-total"
106
+ onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
107
+ <?php else: ?>
108
+ <div class="cart-price">
109
+ <?php endif; ?>
110
 
111
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
112
+ <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()); ?>
113
+ <?php else: ?>
114
+ <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
115
+ <?php endif; ?>
116
 
117
+ </div>
118
 
119
 
120
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
121
 
122
+ <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>"
123
+ style="display:none;">
124
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
125
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
126
+ <span class="weee"><?php echo $tax['title']; ?>
127
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['amount'], true, true); ?></span>
128
+ <?php endforeach; ?>
129
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
130
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
131
+ <span class="weee"><?php echo $tax['title']; ?>
132
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['amount'], true, true); ?></span>
133
+ <?php endforeach; ?>
134
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
135
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
136
+ <span class="weee"><?php echo $tax['title']; ?>
137
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['amount'], true, true); ?></span>
138
+ <?php endforeach; ?>
139
+ <?php endif; ?>
140
+ </div>
141
 
142
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
143
+ <div class="cart-tax-total"
144
+ onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
145
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total'); ?>
146
+ : <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()); ?></span>
147
+ </div>
148
+ <?php endif; ?>
149
+ <?php endif; ?>
150
+ </td>
151
  <?php endif; ?>
152
  <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
153
+ <td>
154
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
155
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
156
+ <div class="cart-tax-total"
157
+ onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
158
+ <?php else: ?>
159
+ <div class="cart-price">
160
+ <?php endif; ?>
161
 
162
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
163
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
164
+ <?php else: ?>
165
+ <?php echo $this->helper('checkout')->formatPrice($_incl - $_item->getWeeeTaxDisposition()) ?>
166
+ <?php endif; ?>
167
 
168
+ </div>
169
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
170
 
171
+ <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>"
172
+ style="display:none;">
173
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
174
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
175
+ <span class="weee"><?php echo $tax['title']; ?>
176
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'], true, true); ?></span>
177
+ <?php endforeach; ?>
178
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
179
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
180
+ <span class="weee"><?php echo $tax['title']; ?>
181
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'], true, true); ?></span>
182
+ <?php endforeach; ?>
183
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
184
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
185
+ <span class="weee"><?php echo $tax['title']; ?>
186
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'], true, true); ?></span>
187
+ <?php endforeach; ?>
188
+ <?php endif; ?>
189
+ </div>
190
 
191
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
192
+ <div class="cart-tax-total"
193
+ onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
194
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
195
+ : <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
196
+ </div>
197
+ <?php endif; ?>
198
+ <?php endif; ?>
199
+ </td>
200
  <?php endif; ?>
201
  <?php endif; ?>
202
+ <td class="a-center">
203
+ <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4"
204
+ title="<?php echo $this->__('Qty') ?>" class="input-text qty" maxlength="12"/>
205
+ </td>
206
+ <?php if (($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
207
  <td class="a-right">
208
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
209
+ <div class="cart-tax-total"
210
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
 
 
 
 
 
 
 
 
211
  <?php else: ?>
212
+ <div class="cart-price">
213
+ <?php endif; ?>
 
 
 
 
214
 
215
+ <?php if ($canApplyMsrp): ?>
216
+ <span class="cart-msrp-subtotal">--</span>
217
+ <?php else: ?>
218
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
219
+ <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?>
220
+ <?php else: ?>
221
+ <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
222
+ <?php endif; ?>
 
 
 
 
 
223
  <?php endif; ?>
224
+
225
  </div>
226
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
227
 
228
+ <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>"
229
+ style="display:none;">
230
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
231
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
232
+ <span class="weee"><?php echo $tax['title']; ?>
233
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'], true, true); ?></span>
234
+ <?php endforeach; ?>
235
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
236
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
237
+ <span class="weee"><?php echo $tax['title']; ?>
238
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'], true, true); ?></span>
239
+ <?php endforeach; ?>
240
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
241
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
242
+ <span class="weee"><?php echo $tax['title']; ?>
243
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'], true, true); ?></span>
244
+ <?php endforeach; ?>
245
+ <?php endif; ?>
246
  </div>
247
+
248
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
249
+ <div class="cart-tax-total"
250
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
251
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total'); ?>
252
+ : <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?></span>
253
+ </div>
254
+ <?php endif; ?>
255
  <?php endif; ?>
 
256
  </td>
257
+ <?php endif; ?>
258
+ <?php if (($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
259
  <td>
260
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
261
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
262
+ <div class="cart-tax-total"
263
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
 
 
 
 
 
 
 
 
264
  <?php else: ?>
265
+ <div class="cart-price">
266
+ <?php endif; ?>
 
267
 
268
+ <?php if ($canApplyMsrp): ?>
269
+ <span class="cart-msrp-subtotal">--</span>
270
+ <?php else: ?>
271
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
272
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
273
+ <?php else: ?>
274
+ <?php echo $this->helper('checkout')->formatPrice($_incl - $_item->getWeeeTaxRowDisposition()) ?>
275
+ <?php endif; ?>
276
+ <?php endif; ?>
277
 
278
+ </div>
279
 
 
280
 
281
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
282
 
283
+ <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>"
284
+ style="display:none;">
285
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
286
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
287
+ <span class="weee"><?php echo $tax['title']; ?>
288
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
289
+ <?php endforeach; ?>
290
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
291
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
292
+ <span class="weee"><?php echo $tax['title']; ?>
293
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
294
+ <?php endforeach; ?>
295
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
296
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
297
+ <span class="weee"><?php echo $tax['title']; ?>
298
+ : <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
299
+ <?php endforeach; ?>
300
+ <?php endif; ?>
301
  </div>
302
+
303
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
304
+ <div class="cart-tax-total"
305
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
306
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
307
+ : <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
308
+ </div>
309
+ <?php endif; ?>
310
  <?php endif; ?>
 
311
  </td>
312
+ <?php endif; ?>
313
+ <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo $this->__('Remove Item') ?>"
314
+ class="btn-remove btn-remove2"><?php echo $this->__('Remove Item') ?></a></td>
315
  </tr>
app/design/frontend/base/default/template/downloadable/checkout/onepage/review/item.phtml CHANGED
@@ -84,12 +84,12 @@
84
  </small>
85
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
86
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
87
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
88
  <?php endforeach; ?>
89
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
90
  <small>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
93
  <?php endforeach; ?>
94
  </small>
95
  <?php endif; ?>
@@ -113,7 +113,7 @@
113
  <?php endif; ?>
114
 
115
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
116
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
117
  <?php else: ?>
118
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
119
  <?php endif; ?>
@@ -125,7 +125,7 @@
125
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
126
  <small>
127
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
128
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
129
  <?php endforeach; ?>
130
  </small>
131
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -143,7 +143,7 @@
143
 
144
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
145
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
146
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
147
  </div>
148
  <?php endif; ?>
149
  <?php endif; ?>
@@ -176,12 +176,12 @@
176
  </small>
177
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
178
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
179
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
180
  <?php endforeach; ?>
181
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
182
  <small>
183
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
184
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
185
  <?php endforeach; ?>
186
  </small>
187
  <?php endif; ?>
@@ -205,7 +205,7 @@
205
  <?php endif; ?>
206
 
207
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
208
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
209
  <?php else: ?>
210
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
211
  <?php endif; ?>
@@ -219,7 +219,7 @@
219
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
220
  <small>
221
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
222
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
223
  <?php endforeach; ?>
224
  </small>
225
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -237,7 +237,7 @@
237
 
238
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
239
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
240
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
241
  </div>
242
  <?php endif; ?>
243
  <?php endif; ?>
84
  </small>
85
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
86
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
87
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></small></span><br />
88
  <?php endforeach; ?>
89
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
90
  <small>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
93
  <?php endforeach; ?>
94
  </small>
95
  <?php endif; ?>
113
  <?php endif; ?>
114
 
115
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
116
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
117
  <?php else: ?>
118
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
119
  <?php endif; ?>
125
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
126
  <small>
127
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
128
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
129
  <?php endforeach; ?>
130
  </small>
131
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
143
 
144
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
145
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
146
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
147
  </div>
148
  <?php endif; ?>
149
  <?php endif; ?>
176
  </small>
177
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
178
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
179
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
180
  <?php endforeach; ?>
181
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
182
  <small>
183
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
184
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
185
  <?php endforeach; ?>
186
  </small>
187
  <?php endif; ?>
205
  <?php endif; ?>
206
 
207
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
208
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
209
  <?php else: ?>
210
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
211
  <?php endif; ?>
219
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
220
  <small>
221
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
222
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
223
  <?php endforeach; ?>
224
  </small>
225
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
237
 
238
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
239
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
240
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
241
  </div>
242
  <?php endif; ?>
243
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml CHANGED
@@ -30,97 +30,107 @@
30
  <td align="left" valign="top" style="padding:3px 9px">
31
  <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32
  <?php if ($this->getItemOptions()): ?>
33
- <dl style="margin:0; padding:0;">
34
- <?php foreach ($this->getItemOptions() as $option): ?>
35
- <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
36
- <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
37
- <?php endforeach; ?>
38
- </dl>
39
  <?php endif; ?>
40
  <?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
41
- <dl style="margin:0; padding:0;">
42
- <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
- <?php foreach ($links as $link): ?>
44
- <dd style="margin:0; padding:0 0 0 9px;"><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
45
- <?php endforeach; ?>
46
- </dl>
47
  <?php endif; ?>
48
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
49
  </td>
50
  <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
51
- <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
52
  <td align="right" valign="top" style="padding:3px 9px">
53
  <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
54
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
55
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
56
  <?php endif; ?>
57
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
58
- <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
59
  <?php else: ?>
60
  <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
61
  <?php endif; ?>
62
 
63
-
64
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
65
- <br />
66
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
67
  <small>
68
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
69
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
70
- <?php endforeach; ?>
 
71
  </small>
72
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
73
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
74
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
 
 
75
  <?php endforeach; ?>
76
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
77
  <small>
78
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
79
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
80
- <?php endforeach; ?>
 
81
  </small>
82
  <?php endif; ?>
83
 
84
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
85
- <br />
86
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
 
87
  <?php endif; ?>
88
  <?php endif; ?>
89
  <?php endif; ?>
90
 
91
-
92
  <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
93
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
94
- <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
95
  <?php endif; ?>
96
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
97
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
98
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
99
- <?php else: ?>
100
- <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
101
- <?php endif; ?>
102
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
103
- <br />
104
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
105
  <small>
106
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
107
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
108
- <?php endforeach; ?>
 
 
109
  </small>
110
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
111
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
112
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
 
 
113
  <?php endforeach; ?>
114
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
115
  <small>
116
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
117
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
118
- <?php endforeach; ?>
 
 
119
  </small>
120
  <?php endif; ?>
121
 
122
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
123
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
 
124
  <?php endif; ?>
125
  <?php endif; ?>
126
  <?php endif; ?>
30
  <td align="left" valign="top" style="padding:3px 9px">
31
  <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32
  <?php if ($this->getItemOptions()): ?>
33
+ <dl style="margin:0; padding:0;">
34
+ <?php foreach ($this->getItemOptions() as $option): ?>
35
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
36
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
37
+ <?php endforeach; ?>
38
+ </dl>
39
  <?php endif; ?>
40
  <?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
41
+ <dl style="margin:0; padding:0;">
42
+ <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
+ <?php foreach ($links as $link): ?>
44
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
45
+ <?php endforeach; ?>
46
+ </dl>
47
  <?php endif; ?>
48
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
49
  </td>
50
  <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
51
+ <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty() * 1 ?></td>
52
  <td align="right" valign="top" style="padding:3px 9px">
53
  <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
54
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
55
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
56
  <?php endif; ?>
57
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
58
+ <?php echo $_order->formatPrice($_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?>
59
  <?php else: ?>
60
  <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
61
  <?php endif; ?>
62
 
 
63
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
64
+ <br/>
65
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
66
  <small>
67
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
68
+ <span class="nobr"><?php echo $tax['title']; ?>
69
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></span><br/>
70
+ <?php endforeach; ?>
71
  </small>
72
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
73
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
74
+ <span class="nobr"><small><?php echo $tax['title']; ?>
75
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></small></span>
76
+ <br/>
77
  <?php endforeach; ?>
78
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
79
  <small>
80
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
81
+ <span class="nobr"><?php echo $tax['title']; ?>
82
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></span><br/>
83
+ <?php endforeach; ?>
84
  </small>
85
  <?php endif; ?>
86
 
87
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
88
+ <br/>
89
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
90
+ :<br/> <?php echo $_order->formatPrice($_item->getCalculationPrice() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?></span>
91
  <?php endif; ?>
92
  <?php endif; ?>
93
  <?php endif; ?>
94
 
 
95
  <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
96
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
97
+ <br/><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
98
  <?php endif; ?>
99
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
100
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
101
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
102
+ <?php else: ?>
103
+ <?php echo $_order->formatPrice($_incl - $_item->getWeeeTaxRowDisposition()) ?>
104
+ <?php endif; ?>
105
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
106
+ <br/>
107
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
108
  <small>
109
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
110
+ <span class="nobr"><?php echo $tax['title']; ?>
111
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
112
+ <br/>
113
+ <?php endforeach; ?>
114
  </small>
115
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
116
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
117
+ <span class="nobr"><small><?php echo $tax['title']; ?>
118
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></small></span>
119
+ <br/>
120
  <?php endforeach; ?>
121
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
122
  <small>
123
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124
+ <span class="nobr"><?php echo $tax['title']; ?>
125
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
126
+ <br/>
127
+ <?php endforeach; ?>
128
  </small>
129
  <?php endif; ?>
130
 
131
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
132
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
133
+ :<br/> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
134
  <?php endif; ?>
135
  <?php endif; ?>
136
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/email/order/items/invoice/downloadable.phtml CHANGED
@@ -26,67 +26,75 @@
26
  ?>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrder(); ?>
 
 
 
29
  <tr>
30
  <td align="left" valign="top" style="padding:3px 9px">
31
  <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32
  <?php if ($this->getItemOptions()): ?>
33
- <dl style="margin:0; padding:0;">
34
- <?php foreach ($this->getItemOptions() as $option): ?>
35
- <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
36
- <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
37
- <?php endforeach; ?>
38
- </dl>
39
  <?php endif; ?>
40
  <?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
41
- <dl style="margin:0; padding:0;">
42
- <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
- <?php foreach ($links as $link): ?>
44
- <dd style="margin:0; padding:0 0 0 9px;">
45
- <?php echo $this->escapeHtml($link->getLinkTitle()); ?>&nbsp;
46
- (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
47
- </dd>
48
- <?php endforeach; ?>
49
- </dl>
 
50
  <?php endif; ?>
51
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
52
  </td>
53
  <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
54
- <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty()*1 ?></td>
55
  <td align="right" valign="top" style="padding:3px 9px">
56
- <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
57
- <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
58
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
59
  <?php endif; ?>
60
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
61
- <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
62
  <?php else: ?>
63
  <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
64
  <?php endif; ?>
65
 
66
-
67
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
68
- <br />
69
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
70
  <small>
71
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
73
- <?php endforeach; ?>
 
74
  </small>
75
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
76
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
77
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
 
 
78
  <?php endforeach; ?>
79
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
80
  <small>
81
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
82
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
83
- <?php endforeach; ?>
 
84
  </small>
85
  <?php endif; ?>
86
 
87
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
88
- <br />
89
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
 
90
  <?php endif; ?>
91
  <?php endif; ?>
92
  <?php endif; ?>
@@ -94,36 +102,43 @@
94
 
95
  <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
96
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
97
- <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
98
  <?php endif; ?>
99
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
100
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
101
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
102
- <?php else: ?>
103
- <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
104
- <?php endif; ?>
105
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
106
- <br />
107
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
108
  <small>
109
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
110
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
111
- <?php endforeach; ?>
 
 
112
  </small>
113
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
114
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
115
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
 
 
116
  <?php endforeach; ?>
117
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
118
  <small>
119
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
120
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
121
- <?php endforeach; ?>
 
 
122
  </small>
123
  <?php endif; ?>
124
 
125
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
126
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
 
127
  <?php endif; ?>
128
  <?php endif; ?>
129
  <?php endif; ?>
26
  ?>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrder(); ?>
29
+ <?php $taxHelper = $this->helper('tax'); ?>
30
+ <?php $weeHelper = Mage::helper('weee'); ?>
31
+
32
  <tr>
33
  <td align="left" valign="top" style="padding:3px 9px">
34
  <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
35
  <?php if ($this->getItemOptions()): ?>
36
+ <dl style="margin:0; padding:0;">
37
+ <?php foreach ($this->getItemOptions() as $option): ?>
38
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
39
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
40
+ <?php endforeach; ?>
41
+ </dl>
42
  <?php endif; ?>
43
  <?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
44
+ <dl style="margin:0; padding:0;">
45
+ <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
46
+ <?php foreach ($links as $link): ?>
47
+ <dd style="margin:0; padding:0 0 0 9px;">
48
+ <?php echo $this->escapeHtml($link->getLinkTitle()); ?>&nbsp;
49
+ (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>"
50
+ style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
51
+ </dd>
52
+ <?php endforeach; ?>
53
+ </dl>
54
  <?php endif; ?>
55
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
56
  </td>
57
  <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
58
+ <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQty() * 1 ?></td>
59
  <td align="right" valign="top" style="padding:3px 9px">
60
+ <?php if ($taxHelper->displayCartPriceExclTax($_order->getStore()) || $taxHelper->displayCartBothPrices($_order->getStore())): ?>
61
+ <?php if ($taxHelper->displayCartBothPrices($_order->getStore())): ?>
62
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
63
  <?php endif; ?>
64
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
65
+ <?php echo $_order->formatPrice($_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?>
66
  <?php else: ?>
67
  <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
68
  <?php endif; ?>
69
 
 
70
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
71
+ <br/>
72
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
73
  <small>
74
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
75
+ <span class="nobr"><?php echo $tax['title']; ?>
76
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></span><br/>
77
+ <?php endforeach; ?>
78
  </small>
79
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
80
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
81
+ <span class="nobr"><small><?php echo $tax['title']; ?>
82
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></small></span>
83
+ <br/>
84
  <?php endforeach; ?>
85
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
86
  <small>
87
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
88
+ <span class="nobr"><?php echo $tax['title']; ?>
89
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></span><br/>
90
+ <?php endforeach; ?>
91
  </small>
92
  <?php endif; ?>
93
 
94
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
95
+ <br/>
96
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
97
+ :<br/> <?php echo $_order->formatPrice($_item->getCalculationPrice() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?></span>
98
  <?php endif; ?>
99
  <?php endif; ?>
100
  <?php endif; ?>
102
 
103
  <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
104
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
105
+ <br/><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
106
  <?php endif; ?>
107
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
108
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
109
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
110
+ <?php else: ?>
111
+ <?php echo $_order->formatPrice($_incl - $_item->getWeeeTaxRowDisposition()) ?>
112
+ <?php endif; ?>
113
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
114
+ <br/>
115
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
116
  <small>
117
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
118
+ <span class="nobr"><?php echo $tax['title']; ?>
119
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
120
+ <br/>
121
+ <?php endforeach; ?>
122
  </small>
123
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
124
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
125
+ <span class="nobr"><small><?php echo $tax['title']; ?>
126
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></small></span>
127
+ <br/>
128
  <?php endforeach; ?>
129
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
130
  <small>
131
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
132
+ <span class="nobr"><?php echo $tax['title']; ?>
133
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
134
+ <br/>
135
+ <?php endforeach; ?>
136
  </small>
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'); ?>
141
+ :<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/downloadable/email/order/items/order/downloadable.phtml CHANGED
@@ -30,106 +30,117 @@
30
  <td align="left" valign="top" style="padding:3px 9px">
31
  <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32
  <?php if ($this->getItemOptions()): ?>
33
- <dl style="margin:0; padding:0;">
34
- <?php foreach ($this->getItemOptions() as $option): ?>
35
- <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
36
- <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
37
- <?php endforeach; ?>
38
- </dl>
39
  <?php endif; ?>
40
  <?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
41
- <dl style="margin:0; padding:0;">
42
- <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
- <?php foreach ($links as $link): ?>
44
- <dd style="margin:0; padding:0 0 0 9px;">
45
- <?php echo $this->escapeHtml($link->getLinkTitle()); ?>&nbsp;
46
- (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>" style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
47
- </dd>
48
- <?php endforeach; ?>
49
- </dl>
 
50
  <?php endif; ?>
51
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
52
  <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
53
- <br /><strong><?php echo $this->__('Gift Message') ?></strong>
54
- <br /><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
55
- <br /><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
56
- <br /><?php echo $this->__('Message:'); ?><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
57
  <?php endif; ?>
58
  </td>
59
  <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
60
- <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
61
  <td align="right" valign="top" style="padding:3px 9px">
62
  <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
63
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
64
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
65
  <?php endif; ?>
66
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
67
- <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
68
  <?php else: ?>
69
  <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
70
  <?php endif; ?>
71
 
72
-
73
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
74
- <br />
75
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
76
  <small>
77
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
78
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
79
- <?php endforeach; ?>
 
80
  </small>
81
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
82
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
83
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
 
 
84
  <?php endforeach; ?>
85
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
86
  <small>
87
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
88
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
89
- <?php endforeach; ?>
 
90
  </small>
91
  <?php endif; ?>
92
 
93
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
94
- <br />
95
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
 
96
  <?php endif; ?>
97
  <?php endif; ?>
98
  <?php endif; ?>
99
 
100
-
101
  <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
102
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
103
- <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
104
  <?php endif; ?>
105
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
106
- <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
107
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
108
- <?php else: ?>
109
- <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
110
- <?php endif; ?>
111
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
112
- <br />
113
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
114
  <small>
115
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
116
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
117
- <?php endforeach; ?>
 
 
118
  </small>
119
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
120
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
121
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
 
 
122
  <?php endforeach; ?>
123
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
124
  <small>
125
- <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
126
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
127
- <?php endforeach; ?>
 
 
128
  </small>
129
  <?php endif; ?>
130
 
131
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
132
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
 
133
  <?php endif; ?>
134
  <?php endif; ?>
135
  <?php endif; ?>
30
  <td align="left" valign="top" style="padding:3px 9px">
31
  <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
32
  <?php if ($this->getItemOptions()): ?>
33
+ <dl style="margin:0; padding:0;">
34
+ <?php foreach ($this->getItemOptions() as $option): ?>
35
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
36
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo $option['value'] ?></dd>
37
+ <?php endforeach; ?>
38
+ </dl>
39
  <?php endif; ?>
40
  <?php if ($links = $this->getLinks()->getPurchasedItems()): ?>
41
+ <dl style="margin:0; padding:0;">
42
+ <dt><strong><em><?php echo $this->getLinksTitle() ?></em></strong></dt>
43
+ <?php foreach ($links as $link): ?>
44
+ <dd style="margin:0; padding:0 0 0 9px;">
45
+ <?php echo $this->escapeHtml($link->getLinkTitle()); ?>&nbsp;
46
+ (<a href="<?php echo $this->getPurchasedLinkUrl($link) ?>"
47
+ style="color:#1E7EC8;"><?php echo Mage::helper('downloadable')->__('download') ?></a>)
48
+ </dd>
49
+ <?php endforeach; ?>
50
+ </dl>
51
  <?php endif; ?>
52
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
53
  <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_item->getGiftMessageId())): ?>
54
+ <br/><strong><?php echo $this->__('Gift Message') ?></strong>
55
+ <br/><?php echo $this->__('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
56
+ <br/><?php echo $this->__('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
57
+ <br/><?php echo $this->__('Message:'); ?><br/> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
58
  <?php endif; ?>
59
  </td>
60
  <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
61
+ <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered() * 1 ?></td>
62
  <td align="right" valign="top" style="padding:3px 9px">
63
  <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
64
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
65
  <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
66
  <?php endif; ?>
67
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
68
+ <?php echo $_order->formatPrice($_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?>
69
  <?php else: ?>
70
  <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
71
  <?php endif; ?>
72
 
 
73
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
74
+ <br/>
75
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
76
  <small>
77
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
78
+ <span class="nobr"><?php echo $tax['title']; ?>
79
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></span><br/>
80
+ <?php endforeach; ?>
81
  </small>
82
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
83
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
84
+ <span class="nobr"><small><?php echo $tax['title']; ?>
85
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></small></span>
86
+ <br/>
87
  <?php endforeach; ?>
88
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
89
  <small>
90
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
91
+ <span class="nobr"><?php echo $tax['title']; ?>
92
+ : <?php echo $_order->formatPrice($tax['row_amount'], true, true); ?></span><br/>
93
+ <?php endforeach; ?>
94
  </small>
95
  <?php endif; ?>
96
 
97
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
98
+ <br/>
99
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
100
+ :<br/> <?php echo $_order->formatPrice($_item->getCalculationPrice() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()); ?></span>
101
  <?php endif; ?>
102
  <?php endif; ?>
103
  <?php endif; ?>
104
 
 
105
  <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
106
  <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
107
+ <br/><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
108
  <?php endif; ?>
109
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
110
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
111
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
112
+ <?php else: ?>
113
+ <?php echo $_order->formatPrice($_incl - $_item->getWeeeTaxRowDisposition()) ?>
114
+ <?php endif; ?>
115
  <?php if (Mage::helper('weee')->getApplied($_item)): ?>
116
+ <br/>
117
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
118
  <small>
119
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
120
+ <span class="nobr"><?php echo $tax['title']; ?>
121
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
122
+ <br/>
123
+ <?php endforeach; ?>
124
  </small>
125
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
126
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
127
+ <span class="nobr"><small><?php echo $tax['title']; ?>
128
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></small></span>
129
+ <br/>
130
  <?php endforeach; ?>
131
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
132
  <small>
133
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
134
+ <span class="nobr"><?php echo $tax['title']; ?>
135
+ : <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
136
+ <br/>
137
+ <?php endforeach; ?>
138
  </small>
139
  <?php endif; ?>
140
 
141
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
142
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
143
+ :<br/> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
144
  <?php endif; ?>
145
  <?php endif; ?>
146
  <?php endif; ?>
app/design/frontend/base/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml CHANGED
@@ -27,281 +27,310 @@
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
- <?php if($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
- <?php foreach ($_options as $_option) : ?>
34
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
- <?php if (!$this->getPrintStatus()): ?>
36
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
39
- <div class="truncated_full_value">
40
- <dl class="item-options">
41
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43
- </dl>
44
- </div>
45
- <?php endif; ?>
46
- </dd>
47
- <?php else: ?>
48
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49
- <?php endif; ?>
50
- <?php endforeach; ?>
51
  </dl>
52
- <?php endif; ?>
53
 
54
- <!-- downloadable -->
55
- <?php if ($links = $this->getLinks()): ?>
56
- <dl class="item-options">
57
- <dt><?php echo $this->getLinksTitle() ?></dt>
58
- <?php foreach ($links->getPurchasedItems() as $link): ?>
59
- <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
60
- <?php endforeach; ?>
61
- </dl>
62
- <?php endif; ?>
63
- <!-- EOF downloadable -->
64
 
65
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
66
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
67
- <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
68
- <?php endif; ?>
69
- </td>
70
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
71
- <td class="a-right nowrap">
72
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
73
- <span class="price-excl-tax">
74
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
75
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
76
- <span class="cart-price">
77
- <?php endif; ?>
78
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
79
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
80
- </span>
81
- <?php endif; ?>
82
- <?php endif; ?>
83
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
85
- <?php else: ?>
86
  <span class="cart-price">
87
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
88
 
89
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
90
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
91
- <?php else: ?>
92
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
93
- <?php endif; ?>
94
 
95
- </span>
96
 
97
 
98
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
99
 
100
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
101
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
102
  <small>
103
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
104
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
105
- <?php endforeach; ?>
 
106
  </small>
107
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
108
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
109
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
110
  <?php endforeach; ?>
111
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
112
  <small>
113
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
114
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
115
- <?php endforeach; ?>
 
116
  </small>
117
  <?php endif; ?>
118
- </span>
119
 
120
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
122
- <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>
123
- </span>
124
- <?php endif; ?>
 
125
  <?php endif; ?>
126
- </span>
127
- <br />
 
128
  <?php endif; ?>
129
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
130
- <span class="price-incl-tax">
131
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
132
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
133
- <span class="cart-price">
134
- <?php endif; ?>
135
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
136
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
137
- </span>
138
- <?php endif; ?>
139
- <?php endif; ?>
140
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
141
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
143
- <?php else: ?>
144
  <span class="cart-price">
145
  <?php endif; ?>
 
 
 
 
 
 
146
 
147
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
149
- <?php else: ?>
150
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
151
- <?php endif; ?>
 
152
 
153
- </span>
 
 
 
 
154
 
 
155
 
156
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
157
 
158
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
159
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
160
- <small>
161
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
162
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
163
- <?php endforeach; ?>
164
- </small>
165
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
166
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
167
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
168
  <?php endforeach; ?>
169
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
- <small>
 
 
 
 
 
 
171
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
172
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
 
173
  <?php endforeach; ?>
174
- </small>
175
- <?php endif; ?>
176
- </span>
177
-
178
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
179
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
180
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
181
- </span>
182
  <?php endif; ?>
183
- <?php endif; ?>
184
- </span>
185
- <?php endif; ?>
186
- </td>
187
- <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
188
- <td class="a-right nowrap">
189
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
190
- <span class="price-excl-tax">
191
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
192
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
193
- <span class="cart-price">
194
- <?php endif; ?>
195
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
196
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
197
- </span>
198
  <?php endif; ?>
199
  <?php endif; ?>
200
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
201
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
202
- <?php else: ?>
 
 
 
 
 
 
203
  <span class="cart-price">
204
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
205
 
206
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
207
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
208
- <?php else: ?>
209
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
210
- <?php endif; ?>
211
 
212
  </span>
213
 
 
214
 
215
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
216
-
217
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
218
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
219
  <small>
220
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
221
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
222
- <?php endforeach; ?>
 
223
  </small>
224
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
225
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
226
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
227
  <?php endforeach; ?>
228
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
229
  <small>
230
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
231
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
232
- <?php endforeach; ?>
 
233
  </small>
234
  <?php endif; ?>
235
  </span>
236
 
237
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
239
- <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>
 
 
240
  </span>
241
- <?php endif; ?>
242
  <?php endif; ?>
243
- </span>
244
- <br />
 
245
  <?php endif; ?>
 
246
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
247
- <span class="price-incl-tax">
248
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
249
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
250
  <span class="cart-price">
251
  <?php endif; ?>
252
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
253
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
254
  </span>
255
  <?php endif; ?>
256
  <?php endif; ?>
257
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
258
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
259
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
260
- <?php else: ?>
261
- <span class="cart-price">
262
- <?php endif; ?>
263
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
264
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
265
- <?php else: ?>
266
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
267
- <?php endif; ?>
 
268
 
269
  </span>
270
 
271
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
272
 
273
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
274
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
275
- <small>
276
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
277
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
278
- <?php endforeach; ?>
279
- </small>
280
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
281
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
282
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
283
  <?php endforeach; ?>
284
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
- <small>
 
 
 
 
 
 
286
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
287
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
 
288
  <?php endforeach; ?>
289
- </small>
290
- <?php endif; ?>
291
- </span>
292
 
293
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
294
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
295
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
296
- </span>
 
 
297
  <?php endif; ?>
298
  <?php endif; ?>
299
-
300
- </span>
301
- <?php endif; ?>
302
- </td>
303
- <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
304
- <td class="last a-right">
305
- <?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
306
- </td>
307
  </tr>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
+ <?php if ($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
+ <?php foreach ($_options as $_option) : ?>
34
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
+ <?php if (!$this->getPrintStatus()): ?>
36
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
39
+ <div class="truncated_full_value">
40
+ <dl class="item-options">
41
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43
+ </dl>
44
+ </div>
45
+ <?php endif; ?>
46
+ </dd>
47
+ <?php else: ?>
48
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
49
+ <?php endif; ?>
50
+ <?php endforeach; ?>
51
  </dl>
52
+ <?php endif; ?>
53
 
54
+ <!-- downloadable -->
55
+ <?php if ($links = $this->getLinks()): ?>
56
+ <dl class="item-options">
57
+ <dt><?php echo $this->getLinksTitle() ?></dt>
58
+ <?php foreach ($links->getPurchasedItems() as $link): ?>
59
+ <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
60
+ <?php endforeach; ?>
61
+ </dl>
62
+ <?php endif; ?>
63
+ <!-- EOF downloadable -->
64
 
65
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
66
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
67
+ <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
68
+ class="giftmessage-preview-link expand"
69
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
70
+ <?php endif; ?>
71
+ </td>
72
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
73
+ <td class="a-right nowrap">
74
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
75
+ <span class="price-excl-tax">
76
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
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')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
139
+ <span class="price-incl-tax">
140
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
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
 
151
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
152
+ <span class="cart-tax-total"
153
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
154
+ <?php else: ?>
155
+ <span class="cart-price">
156
+ <?php endif; ?>
157
 
158
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
159
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
160
+ <?php else: ?>
161
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
162
+ <?php endif; ?>
163
 
164
+ </span>
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
+ </td>
203
+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
204
+ <td class="a-right nowrap">
205
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
206
+ <span class="price-excl-tax">
207
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
208
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
209
  <span class="cart-price">
210
  <?php endif; ?>
211
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
212
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
213
+ </span>
214
+ <?php endif; ?>
215
+ <?php endif; ?>
216
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
+ <span class="cart-tax-total"
218
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
219
+ <?php else: ?>
220
+ <span class="cart-price">
221
+ <?php endif; ?>
222
 
223
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
224
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
225
+ <?php else: ?>
226
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
227
+ <?php endif; ?>
228
 
229
  </span>
230
 
231
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
232
 
233
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
234
+ style="display:none;">
 
235
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']; ?>
239
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
240
+ <?php endforeach; ?>
241
  </small>
242
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
244
+ <span class="nobr"><small><?php echo $tax['title']; ?>
245
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
246
  <?php endforeach; ?>
247
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
  <small>
249
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
250
+ <span class="nobr"><?php echo $tax['title']; ?>
251
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
252
+ <?php endforeach; ?>
253
  </small>
254
  <?php endif; ?>
255
  </span>
256
 
257
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
258
+ <span class="cart-tax-total"
259
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
260
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
261
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
262
  </span>
 
263
  <?php endif; ?>
264
+ <?php endif; ?>
265
+ </span>
266
+ <br/>
267
  <?php endif; ?>
268
+
269
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
270
+ <span class="price-incl-tax">
271
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
272
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
  <span class="cart-price">
274
  <?php endif; ?>
275
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
276
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
277
  </span>
278
  <?php endif; ?>
279
  <?php endif; ?>
280
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
281
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
282
+ <span class="cart-tax-total"
283
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
284
+ <?php else: ?>
285
+ <span class="cart-price">
286
+ <?php endif; ?>
287
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
288
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
289
+ <?php else: ?>
290
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
291
+ <?php endif; ?>
292
 
293
  </span>
294
 
295
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
296
 
297
+ <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
298
+ style="display:none;">
299
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
300
+ <small>
 
 
 
 
301
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
302
+ <span class="nobr"><?php echo $tax['title']; ?>
303
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
304
  <?php endforeach; ?>
305
+ </small>
306
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
307
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
308
+ <span class="nobr"><small><?php echo $tax['title']; ?>
309
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
310
+ <?php endforeach; ?>
311
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
312
+ <small>
313
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
314
+ <span class="nobr"><?php echo $tax['title']; ?>
315
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
316
  <?php endforeach; ?>
317
+ </small>
318
+ <?php endif; ?>
319
+ </span>
320
 
321
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
322
+ <span class="cart-tax-total"
323
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
324
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
325
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
326
+ </span>
327
  <?php endif; ?>
328
  <?php endif; ?>
329
+ </span>
330
+ <?php endif; ?>
331
+ </td>
332
+ <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
333
+ <td class="last a-right">
334
+ <?php echo $_order->formatPrice($_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()) ?>
335
+ </td>
 
336
  </tr>
app/design/frontend/base/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml CHANGED
@@ -27,281 +27,302 @@
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
- <?php if($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
- <?php foreach ($_options as $_option) : ?>
34
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
- <?php if (!$this->getPrintStatus()): ?>
36
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
38
- <?php echo $_formatedOptionValue['value'] ?>
39
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
40
- <div class="truncated_full_value">
41
- <dl class="item-options">
42
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44
- </dl>
45
- </div>
46
- <?php endif; ?>
47
- </dd>
48
- <?php else: ?>
49
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50
- <?php endif; ?>
51
- <?php endforeach; ?>
52
  </dl>
53
- <?php endif; ?>
54
 
55
- <!-- downloadable -->
56
- <?php if ($links = $this->getLinks()): ?>
57
- <dl class="item-options">
58
- <dt><?php echo $this->getLinksTitle() ?></dt>
59
- <?php foreach ($links->getPurchasedItems() as $link): ?>
60
- <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
61
- <?php endforeach; ?>
62
- </dl>
63
- <?php endif; ?>
64
- <!-- EOF downloadable -->
65
 
66
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
67
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
68
- <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
69
- <?php endif; ?>
70
- </td>
71
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
72
- <td class="a-right nowrap">
73
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
74
- <span class="price-excl-tax">
75
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
76
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
77
- <span class="cart-price">
78
- <?php endif; ?>
79
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
80
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
81
- </span>
82
- <?php endif; ?>
83
- <?php endif; ?>
84
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
85
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
86
- <?php else: ?>
87
  <span class="cart-price">
88
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
89
 
90
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
91
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
92
- <?php else: ?>
93
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
94
- <?php endif; ?>
95
-
96
  </span>
97
 
 
98
 
99
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
100
-
101
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
102
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
103
  <small>
104
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
105
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
106
- <?php endforeach; ?>
 
107
  </small>
108
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
110
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
111
  <?php endforeach; ?>
112
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
113
  <small>
114
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
115
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
116
- <?php endforeach; ?>
 
117
  </small>
118
  <?php endif; ?>
119
  </span>
120
 
121
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
122
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
123
- <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>
 
 
124
  </span>
125
- <?php endif; ?>
126
  <?php endif; ?>
127
- </span>
128
- <br />
 
129
  <?php endif; ?>
130
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
131
- <span class="price-incl-tax">
132
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
133
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
134
- <span class="cart-price">
135
- <?php endif; ?>
136
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
137
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
138
- </span>
139
- <?php endif; ?>
140
- <?php endif; ?>
141
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
142
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
143
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
144
- <?php else: ?>
145
  <span class="cart-price">
146
  <?php endif; ?>
 
 
 
 
 
 
147
 
148
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
150
- <?php else: ?>
151
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
152
- <?php endif; ?>
 
153
 
154
- </span>
 
 
 
 
155
 
 
156
 
157
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
158
 
159
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
160
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
161
- <small>
 
162
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
163
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
 
164
  <?php endforeach; ?>
165
- </small>
166
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
167
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
168
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
169
  <?php endforeach; ?>
170
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, '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']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
174
- <?php endforeach; ?>
175
- </small>
176
- <?php endif; ?>
177
- </span>
178
-
179
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
180
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
181
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
182
- </span>
183
  <?php endif; ?>
184
- <?php endif; ?>
185
- </span>
186
- <?php endif; ?>
187
- </td>
188
- <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
189
- <td class="a-right nowrap">
190
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
191
- <span class="price-excl-tax">
192
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
193
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
194
- <span class="cart-price">
195
- <?php endif; ?>
196
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
197
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
198
- </span>
199
  <?php endif; ?>
200
  <?php endif; ?>
201
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
202
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
203
- <?php else: ?>
 
 
 
 
 
 
204
  <span class="cart-price">
205
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
206
 
207
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
208
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
209
- <?php else: ?>
210
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
211
- <?php endif; ?>
212
 
213
  </span>
214
 
 
215
 
216
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
217
-
218
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
219
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
220
  <small>
221
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
222
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
223
- <?php endforeach; ?>
 
224
  </small>
225
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
227
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
228
  <?php endforeach; ?>
229
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
230
  <small>
231
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
232
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
233
- <?php endforeach; ?>
 
234
  </small>
235
  <?php endif; ?>
236
  </span>
237
 
238
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
239
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
240
- <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>
 
 
241
  </span>
242
- <?php endif; ?>
243
  <?php endif; ?>
244
- </span>
245
- <br />
 
246
  <?php endif; ?>
247
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
248
- <span class="price-incl-tax">
249
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
250
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
- <span class="cart-price">
252
- <?php endif; ?>
253
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
254
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
255
- </span>
256
- <?php endif; ?>
257
- <?php endif; ?>
258
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
259
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
260
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
261
- <?php else: ?>
262
  <span class="cart-price">
263
  <?php endif; ?>
264
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
265
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
266
- <?php else: ?>
267
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
268
- <?php endif; ?>
269
-
 
 
 
 
 
 
 
 
 
 
 
270
  </span>
271
 
272
-
273
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
274
-
275
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
276
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
277
- <small>
278
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
279
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
 
280
  <?php endforeach; ?>
281
- </small>
282
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
283
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
284
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
285
  <?php endforeach; ?>
286
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
287
- <small>
288
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
289
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
290
- <?php endforeach; ?>
291
- </small>
292
- <?php endif; ?>
293
- </span>
294
 
295
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
296
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
297
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
298
- </span>
 
 
299
  <?php endif; ?>
300
  <?php endif; ?>
301
-
302
-
303
-
304
- </span>
305
- <?php endif; ?>
306
- </td>
307
  </tr>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
+ <?php if ($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
+ <?php foreach ($_options as $_option) : ?>
34
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
+ <?php if (!$this->getPrintStatus()): ?>
36
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
38
+ <?php echo $_formatedOptionValue['value'] ?>
39
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
40
+ <div class="truncated_full_value">
41
+ <dl class="item-options">
42
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44
+ </dl>
45
+ </div>
46
+ <?php endif; ?>
47
+ </dd>
48
+ <?php else: ?>
49
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
50
+ <?php endif; ?>
51
+ <?php endforeach; ?>
52
  </dl>
53
+ <?php endif; ?>
54
 
55
+ <!-- downloadable -->
56
+ <?php if ($links = $this->getLinks()): ?>
57
+ <dl class="item-options">
58
+ <dt><?php echo $this->getLinksTitle() ?></dt>
59
+ <?php foreach ($links->getPurchasedItems() as $link): ?>
60
+ <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
61
+ <?php endforeach; ?>
62
+ </dl>
63
+ <?php endif; ?>
64
+ <!-- EOF downloadable -->
65
 
66
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
67
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
68
+ <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
69
+ class="giftmessage-preview-link expand"
70
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
71
+ <?php endif; ?>
72
+ </td>
73
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
74
+ <td class="a-right nowrap">
75
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
76
+ <span class="price-excl-tax">
77
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
78
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
 
 
79
  <span class="cart-price">
80
  <?php endif; ?>
81
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
82
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
+ </span>
84
+ <?php endif; ?>
85
+ <?php endif; ?>
86
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
87
+ <span class="cart-tax-total"
88
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
89
+ <?php else: ?>
90
+ <span class="cart-price">
91
+ <?php endif; ?>
92
 
93
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
94
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
95
+ <?php else: ?>
96
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
97
+ <?php endif; ?>
 
98
  </span>
99
 
100
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
101
 
102
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
103
+ style="display:none;">
 
104
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
  <small>
106
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
107
+ <span class="nobr"><?php echo $tax['title']; ?>
108
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
109
+ <?php endforeach; ?>
110
  </small>
111
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
112
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
113
+ <span class="nobr"><small><?php echo $tax['title']; ?>
114
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
115
  <?php endforeach; ?>
116
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
117
  <small>
118
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
119
+ <span class="nobr"><?php echo $tax['title']; ?>
120
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
121
+ <?php endforeach; ?>
122
  </small>
123
  <?php endif; ?>
124
  </span>
125
 
126
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
127
+ <span class="cart-tax-total"
128
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
129
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
130
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
131
  </span>
 
132
  <?php endif; ?>
133
+ <?php endif; ?>
134
+ </span>
135
+ <br/>
136
  <?php endif; ?>
137
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
138
+ <span class="price-incl-tax">
139
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
140
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
 
 
 
 
 
141
  <span class="cart-price">
142
  <?php endif; ?>
143
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
144
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
145
+ </span>
146
+ <?php endif; ?>
147
+ <?php endif; ?>
148
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
149
 
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
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
166
 
167
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
168
+ style="display:none;">
169
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
+ <small>
171
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
172
+ <span class="nobr"><?php echo $tax['title']; ?>
173
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
174
  <?php endforeach; ?>
175
+ </small>
176
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
177
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
178
+ <span class="nobr"><small><?php echo $tax['title']; ?>
179
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
180
+ <?php endforeach; ?>
181
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
182
+ <small>
183
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
184
+ <span class="nobr"><?php echo $tax['title']; ?>
185
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
186
  <?php endforeach; ?>
187
+ </small>
 
 
 
 
 
 
 
 
 
 
 
 
188
  <?php endif; ?>
189
+ </span>
190
+
191
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
192
+ <span class="cart-tax-total"
193
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
194
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
195
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
196
+ </span>
 
 
 
 
 
 
 
197
  <?php endif; ?>
198
  <?php endif; ?>
199
+ </span>
200
+ <?php endif; ?>
201
+ </td>
202
+ <td class="a-center"><?php echo $_item->getQty() * 1 ?> </td>
203
+ <td class="a-right nowrap">
204
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
205
+ <span class="price-excl-tax">
206
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
207
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
208
  <span class="cart-price">
209
  <?php endif; ?>
210
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
211
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
212
+ </span>
213
+ <?php endif; ?>
214
+ <?php endif; ?>
215
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
216
+ <span class="cart-tax-total"
217
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
218
+ <?php else: ?>
219
+ <span class="cart-price">
220
+ <?php endif; ?>
221
 
222
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
223
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
224
+ <?php else: ?>
225
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
226
+ <?php endif; ?>
227
 
228
  </span>
229
 
230
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
231
 
232
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
233
+ style="display:none;">
 
234
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
235
  <small>
236
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
237
+ <span class="nobr"><?php echo $tax['title']; ?>
238
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
239
+ <?php endforeach; ?>
240
  </small>
241
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
242
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
243
+ <span class="nobr"><small><?php echo $tax['title']; ?>
244
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
245
  <?php endforeach; ?>
246
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
247
  <small>
248
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
249
+ <span class="nobr"><?php echo $tax['title']; ?>
250
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
251
+ <?php endforeach; ?>
252
  </small>
253
  <?php endif; ?>
254
  </span>
255
 
256
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
+ <span class="cart-tax-total"
258
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
259
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
260
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
261
  </span>
 
262
  <?php endif; ?>
263
+ <?php endif; ?>
264
+ </span>
265
+ <br/>
266
  <?php endif; ?>
267
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
268
+ <span class="price-incl-tax">
269
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
270
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
 
 
 
 
 
271
  <span class="cart-price">
272
  <?php endif; ?>
273
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
274
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
275
+ </span>
276
+ <?php endif; ?>
277
+ <?php endif; ?>
278
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
279
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
280
+ <span class="cart-tax-total"
281
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
282
+ <?php else: ?>
283
+ <span class="cart-price">
284
+ <?php endif; ?>
285
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
287
+ <?php else: ?>
288
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
289
+ <?php endif; ?>
290
  </span>
291
 
 
292
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
293
+ <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
294
+ style="display:none;">
295
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
296
+ <small>
297
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
298
+ <span class="nobr"><?php echo $tax['title']; ?>
299
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
300
  <?php endforeach; ?>
301
+ </small>
302
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
303
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
304
+ <span class="nobr"><small><?php echo $tax['title']; ?>
305
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
306
+ <?php endforeach; ?>
307
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
308
+ <small>
309
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
310
+ <span class="nobr"><?php echo $tax['title']; ?>
311
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
312
  <?php endforeach; ?>
313
+ </small>
314
+ <?php endif; ?>
315
+ </span>
 
 
 
 
 
316
 
317
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
318
+ <span class="cart-tax-total"
319
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
320
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
321
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
322
+ </span>
323
  <?php endif; ?>
324
  <?php endif; ?>
325
+ </span>
326
+ <?php endif; ?>
327
+ </td>
 
 
 
328
  </tr>
app/design/frontend/base/default/template/downloadable/sales/order/items/renderer/downloadable.phtml CHANGED
@@ -26,299 +26,330 @@
26
  ?>
27
  <?php $_item = $this->getItem() ?>
28
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29
- <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
30
- <?php if($_options = $this->getItemOptions()): ?>
31
  <dl class="item-options">
32
- <?php foreach ($_options as $_option) : ?>
33
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
34
- <?php if (!$this->getPrintStatus()): ?>
35
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
36
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
37
- <?php echo $_formatedOptionValue['value'] ?>
38
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
39
- <div class="truncated_full_value">
40
- <dl class="item-options">
41
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43
- </dl>
44
- </div>
45
- <?php endif; ?>
46
- </dd>
47
- <?php else: ?>
48
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49
- <?php endif; ?>
50
- <?php endforeach; ?>
51
  </dl>
52
- <?php endif; ?>
53
 
54
- <!-- downloadable -->
55
- <?php if ($links = $this->getLinks()): ?>
56
- <dl class="item-options">
57
- <dt><?php echo $this->getLinksTitle() ?></dt>
58
- <?php foreach ($links->getPurchasedItems() as $link): ?>
59
- <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
60
- <?php endforeach; ?>
61
- </dl>
62
- <?php endif; ?>
63
- <!-- EOF downloadable -->
64
 
65
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
66
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
67
- <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
68
- <?php endif; ?>
69
- </td>
70
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
71
- <td class="a-right nowrap">
72
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
73
- <span class="price-excl-tax">
74
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
75
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
76
- <span class="cart-price">
77
- <?php endif; ?>
78
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
79
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
80
- </span>
81
- <?php endif; ?>
82
- <?php endif; ?>
83
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
85
- <?php else: ?>
86
  <span class="cart-price">
87
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
88
 
89
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
90
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
91
- <?php else: ?>
92
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
93
- <?php endif; ?>
94
-
95
  </span>
96
 
 
97
 
98
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
99
-
100
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
101
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
102
  <small>
103
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
104
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
105
- <?php endforeach; ?>
 
106
  </small>
107
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
108
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
109
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
110
  <?php endforeach; ?>
111
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
112
  <small>
113
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
114
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
115
- <?php endforeach; ?>
 
116
  </small>
117
  <?php endif; ?>
118
  </span>
119
 
120
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
122
- <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>
123
- </span>
124
- <?php endif; ?>
 
125
  <?php endif; ?>
126
- </span>
127
- <br />
 
128
  <?php endif; ?>
129
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
130
- <span class="price-incl-tax">
131
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
132
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
133
- <span class="cart-price">
134
- <?php endif; ?>
135
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
136
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
137
- </span>
138
- <?php endif; ?>
139
- <?php endif; ?>
140
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
141
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
143
- <?php else: ?>
144
  <span class="cart-price">
145
  <?php endif; ?>
 
 
 
 
 
 
146
 
147
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
149
- <?php else: ?>
150
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
151
- <?php endif; ?>
 
152
 
153
- </span>
 
 
 
 
154
 
 
155
 
156
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
157
 
158
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
159
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
160
- <small>
 
161
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
162
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
 
163
  <?php endforeach; ?>
164
- </small>
165
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
166
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
167
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
168
- <?php endforeach; ?>
169
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
- <small>
 
171
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
172
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
 
173
  <?php endforeach; ?>
174
- </small>
175
- <?php endif; ?>
176
- </span>
177
 
178
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
179
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
180
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
181
- </span>
 
 
182
  <?php endif; ?>
183
  <?php endif; ?>
184
- </span>
185
- <?php endif; ?>
186
- </td>
187
- <td class="a-right nowrap">
 
188
  <span class="nobr">
189
  <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
190
- <?php echo $this->__('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
191
- <?php endif; ?>
192
- <?php if ($this->getItem()->getQtyShipped() > 0): ?>
193
- <?php echo $this->__('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
194
- <?php endif; ?>
195
- <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
196
- <?php echo $this->__('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
197
- <?php endif; ?>
198
- <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
199
- <?php echo $this->__('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
200
- <?php endif; ?>
201
- </span>
202
- </td>
203
- <td class="a-right nowrap">
204
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
205
- <span class="price-excl-tax">
206
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
207
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
208
- <span class="cart-price">
209
- <?php endif; ?>
210
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
211
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
212
- </span>
213
- <?php endif; ?>
214
  <?php endif; ?>
215
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
216
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
217
- <?php else: ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
218
  <span class="cart-price">
219
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
220
 
221
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
222
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
223
- <?php else: ?>
224
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
225
- <?php endif; ?>
226
 
227
- </span>
228
 
229
 
230
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
231
 
232
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
233
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
234
  <small>
235
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
236
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
237
- <?php endforeach; ?>
 
238
  </small>
239
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
240
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
241
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
242
  <?php endforeach; ?>
243
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
244
  <small>
245
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
246
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
247
- <?php endforeach; ?>
 
248
  </small>
249
  <?php endif; ?>
250
  </span>
251
 
252
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
254
- <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>
 
 
255
  </span>
256
- <?php endif; ?>
257
  <?php endif; ?>
258
- </span>
259
- <br />
 
260
  <?php endif; ?>
261
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
262
- <span class="price-incl-tax">
263
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
264
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
265
- <span class="cart-price">
266
- <?php endif; ?>
267
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
268
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
269
- </span>
270
- <?php endif; ?>
271
- <?php endif; ?>
272
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
273
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
274
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
275
- <?php else: ?>
276
  <span class="cart-price">
277
  <?php endif; ?>
278
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
279
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
280
- <?php else: ?>
281
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
282
- <?php endif; ?>
 
283
 
284
- </span>
 
 
 
 
 
 
 
 
 
 
285
 
 
286
 
287
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
288
 
289
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
290
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
291
- <small>
292
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
293
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
294
- <?php endforeach; ?>
295
- </small>
296
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
297
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
298
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
299
  <?php endforeach; ?>
300
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
301
- <small>
 
 
 
 
 
 
302
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
303
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
 
304
  <?php endforeach; ?>
305
- </small>
306
- <?php endif; ?>
307
- </span>
308
 
309
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
310
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
311
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
312
- </span>
 
 
313
  <?php endif; ?>
314
  <?php endif; ?>
315
-
316
-
317
-
318
- </span>
319
- <?php endif; ?>
320
- </td>
321
- <!--
322
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
323
  <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
324
  <?php endif; ?>
26
  ?>
27
  <?php $_item = $this->getItem() ?>
28
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29
+ <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
30
+ <?php if ($_options = $this->getItemOptions()): ?>
31
  <dl class="item-options">
32
+ <?php foreach ($_options as $_option) : ?>
33
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
34
+ <?php if (!$this->getPrintStatus()): ?>
35
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
36
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
37
+ <?php echo $_formatedOptionValue['value'] ?>
38
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
39
+ <div class="truncated_full_value">
40
+ <dl class="item-options">
41
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43
+ </dl>
44
+ </div>
45
+ <?php endif; ?>
46
+ </dd>
47
+ <?php else: ?>
48
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
49
+ <?php endif; ?>
50
+ <?php endforeach; ?>
51
  </dl>
52
+ <?php endif; ?>
53
 
54
+ <!-- downloadable -->
55
+ <?php if ($links = $this->getLinks()): ?>
56
+ <dl class="item-options">
57
+ <dt><?php echo $this->getLinksTitle() ?></dt>
58
+ <?php foreach ($links->getPurchasedItems() as $link): ?>
59
+ <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
60
+ <?php endforeach; ?>
61
+ </dl>
62
+ <?php endif; ?>
63
+ <!-- EOF downloadable -->
64
 
65
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
66
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
67
+ <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
68
+ class="giftmessage-preview-link expand"
69
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
70
+ <?php endif; ?>
71
+ </td>
72
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
73
+
74
+ <td class="a-right nowrap">
75
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
76
+ <span class="price-excl-tax">
77
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
78
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
 
79
  <span class="cart-price">
80
  <?php endif; ?>
81
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
82
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
+ </span>
84
+ <?php endif; ?>
85
+ <?php endif; ?>
86
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
87
+ <span class="cart-tax-total"
88
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
89
+ <?php else: ?>
90
+ <span class="cart-price">
91
+ <?php endif; ?>
92
 
93
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
94
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
95
+ <?php else: ?>
96
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
97
+ <?php endif; ?>
 
98
  </span>
99
 
100
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
101
 
102
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
103
+ style="display:none;">
 
104
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
  <small>
106
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
107
+ <span class="nobr"><?php echo $tax['title']; ?>
108
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
109
+ <?php endforeach; ?>
110
  </small>
111
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
112
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
113
+ <span class="nobr"><small><?php echo $tax['title']; ?>
114
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
115
  <?php endforeach; ?>
116
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
117
  <small>
118
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
119
+ <span class="nobr"><?php echo $tax['title']; ?>
120
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
121
+ <?php endforeach; ?>
122
  </small>
123
  <?php endif; ?>
124
  </span>
125
 
126
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
127
+ <span class="cart-tax-total"
128
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
129
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
130
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
131
+ </span>
132
  <?php endif; ?>
133
+ <?php endif; ?>
134
+ </span>
135
+ <br/>
136
  <?php endif; ?>
137
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
138
+ <span class="price-incl-tax">
139
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
140
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
 
 
 
 
 
141
  <span class="cart-price">
142
  <?php endif; ?>
143
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
144
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
145
+ </span>
146
+ <?php endif; ?>
147
+ <?php endif; ?>
148
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
149
 
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
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
166
 
167
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
168
+ style="display:none;">
169
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
+ <small>
171
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
172
+ <span class="nobr"><?php echo $tax['title']; ?>
173
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
174
  <?php endforeach; ?>
175
+ </small>
176
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
177
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
178
+ <span class="nobr"><small><?php echo $tax['title']; ?>
179
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
180
+ <?php endforeach; ?>
181
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
182
+ <small>
183
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
184
+ <span class="nobr"><?php echo $tax['title']; ?>
185
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
186
  <?php endforeach; ?>
187
+ </small>
188
+ <?php endif; ?>
189
+ </span>
190
 
191
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
192
+ <span class="cart-tax-total"
193
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
194
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
195
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
196
+ </span>
197
  <?php endif; ?>
198
  <?php endif; ?>
199
+ </span>
200
+ <?php endif; ?>
201
+ </td>
202
+
203
+ <td class="a-right nowrap">
204
  <span class="nobr">
205
  <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
206
+ <?php echo $this->__('Ordered'); ?>:
207
+ <strong><?php echo $this->getItem()->getQtyOrdered() * 1 ?></strong><br/>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
208
  <?php endif; ?>
209
+ <?php if ($this->getItem()->getQtyShipped() > 0): ?>
210
+ <?php echo $this->__('Shipped'); ?>:
211
+ <strong><?php echo $this->getItem()->getQtyShipped() * 1 ?></strong><br/>
212
+ <?php endif; ?>
213
+ <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
214
+ <?php echo $this->__('Canceled'); ?>:
215
+ <strong><?php echo $this->getItem()->getQtyCanceled() * 1 ?></strong><br/>
216
+ <?php endif; ?>
217
+ <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
218
+ <?php echo $this->__('Refunded'); ?>:
219
+ <strong><?php echo $this->getItem()->getQtyRefunded() * 1 ?></strong><br/>
220
+ <?php endif; ?>
221
+ </span>
222
+ </td>
223
+ <td class="a-right nowrap">
224
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
225
+ <span class="price-excl-tax">
226
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
227
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
228
  <span class="cart-price">
229
  <?php endif; ?>
230
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
231
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
232
+ </span>
233
+ <?php endif; ?>
234
+ <?php endif; ?>
235
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
236
+ <span class="cart-tax-total"
237
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
238
+ <?php else: ?>
239
+ <span class="cart-price">
240
+ <?php endif; ?>
241
 
242
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
244
+ <?php else: ?>
245
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
246
+ <?php endif; ?>
247
 
248
+ </span>
249
 
250
 
251
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
252
 
253
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
254
+ style="display:none;">
255
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
256
  <small>
257
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
258
+ <span class="nobr"><?php echo $tax['title']; ?>
259
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
260
+ <?php endforeach; ?>
261
  </small>
262
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
263
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
264
+ <span class="nobr"><small><?php echo $tax['title']; ?>
265
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
266
  <?php endforeach; ?>
267
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
268
  <small>
269
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
270
+ <span class="nobr"><?php echo $tax['title']; ?>
271
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
272
+ <?php endforeach; ?>
273
  </small>
274
  <?php endif; ?>
275
  </span>
276
 
277
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
278
+ <span class="cart-tax-total"
279
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
280
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
281
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
282
  </span>
 
283
  <?php endif; ?>
284
+ <?php endif; ?>
285
+ </span>
286
+ <br/>
287
  <?php endif; ?>
288
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
289
+ <span class="price-incl-tax">
290
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
291
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
 
 
 
 
 
 
 
 
 
 
 
292
  <span class="cart-price">
293
  <?php endif; ?>
294
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
295
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
296
+ </span>
297
+ <?php endif; ?>
298
+ <?php endif; ?>
299
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
300
 
301
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
302
+ <span class="cart-tax-total"
303
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
304
+ <?php else: ?>
305
+ <span class="cart-price">
306
+ <?php endif; ?>
307
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
308
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
309
+ <?php else: ?>
310
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
311
+ <?php endif; ?>
312
 
313
+ </span>
314
 
315
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
316
 
317
+ <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
318
+ style="display:none;">
319
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
320
+ <small>
 
 
 
 
321
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
322
+ <span class="nobr"><?php echo $tax['title']; ?>
323
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
324
  <?php endforeach; ?>
325
+ </small>
326
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
327
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
328
+ <span class="nobr"><small><?php echo $tax['title']; ?>
329
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
330
+ <?php endforeach; ?>
331
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
332
+ <small>
333
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
334
+ <span class="nobr"><?php echo $tax['title']; ?>
335
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
336
  <?php endforeach; ?>
337
+ </small>
338
+ <?php endif; ?>
339
+ </span>
340
 
341
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
342
+ <span class="cart-tax-total"
343
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
344
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
345
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
346
+ </span>
347
  <?php endif; ?>
348
  <?php endif; ?>
349
+ </span>
350
+ <?php endif; ?>
351
+ </td>
352
+ <!--
 
 
 
353
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
354
  <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
355
  <?php endif; ?>
app/design/frontend/base/default/template/email/order/items/creditmemo/default.phtml CHANGED
@@ -67,12 +67,12 @@
67
  </small>
68
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
69
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
70
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
71
  <?php endforeach; ?>
72
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
73
  <small>
74
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
75
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
76
  <?php endforeach; ?>
77
  </small>
78
  <?php endif; ?>
@@ -91,7 +91,7 @@
91
  <?php endif; ?>
92
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
93
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
94
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
95
  <?php else: ?>
96
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
97
  <?php endif; ?>
@@ -100,7 +100,7 @@
100
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
101
  <small>
102
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
104
  <?php endforeach; ?>
105
  </small>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
@@ -116,7 +116,7 @@
116
  <?php endif; ?>
117
 
118
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
119
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
120
  <?php endif; ?>
121
  <?php endif; ?>
122
  <?php endif; ?>
67
  </small>
68
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
69
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
70
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
71
  <?php endforeach; ?>
72
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
73
  <small>
74
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
75
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
76
  <?php endforeach; ?>
77
  </small>
78
  <?php endif; ?>
91
  <?php endif; ?>
92
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
93
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
94
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
95
  <?php else: ?>
96
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
97
  <?php endif; ?>
100
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
101
  <small>
102
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
104
  <?php endforeach; ?>
105
  </small>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
116
  <?php endif; ?>
117
 
118
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
119
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
120
  <?php endif; ?>
121
  <?php endif; ?>
122
  <?php endif; ?>
app/design/frontend/base/default/template/email/order/items/invoice/default.phtml CHANGED
@@ -67,12 +67,12 @@
67
  </small>
68
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
69
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
70
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
71
  <?php endforeach; ?>
72
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
73
  <small>
74
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
75
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
76
  <?php endforeach; ?>
77
  </small>
78
  <?php endif; ?>
@@ -91,7 +91,7 @@
91
  <?php endif; ?>
92
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
93
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
94
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
95
  <?php else: ?>
96
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
97
  <?php endif; ?>
@@ -100,7 +100,7 @@
100
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
101
  <small>
102
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
104
  <?php endforeach; ?>
105
  </small>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
@@ -116,7 +116,7 @@
116
  <?php endif; ?>
117
 
118
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
119
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
120
  <?php endif; ?>
121
  <?php endif; ?>
122
  <?php endif; ?>
67
  </small>
68
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
69
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
70
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
71
  <?php endforeach; ?>
72
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
73
  <small>
74
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
75
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
76
  <?php endforeach; ?>
77
  </small>
78
  <?php endif; ?>
91
  <?php endif; ?>
92
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
93
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
94
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
95
  <?php else: ?>
96
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
97
  <?php endif; ?>
100
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
101
  <small>
102
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
104
  <?php endforeach; ?>
105
  </small>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
116
  <?php endif; ?>
117
 
118
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
119
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
120
  <?php endif; ?>
121
  <?php endif; ?>
122
  <?php endif; ?>
app/design/frontend/base/default/template/email/order/items/order/default.phtml CHANGED
@@ -69,12 +69,12 @@
69
  </small>
70
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
71
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
73
  <?php endforeach; ?>
74
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
75
  <small>
76
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
77
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
78
  <?php endforeach; ?>
79
  </small>
80
  <?php endif; ?>
@@ -93,7 +93,7 @@
93
  <?php endif; ?>
94
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
95
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
96
- <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
97
  <?php else: ?>
98
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
99
  <?php endif; ?>
@@ -102,7 +102,7 @@
102
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
103
  <small>
104
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
106
  <?php endforeach; ?>
107
  </small>
108
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
@@ -118,7 +118,7 @@
118
  <?php endif; ?>
119
 
120
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
121
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
122
  <?php endif; ?>
123
  <?php endif; ?>
124
  <?php endif; ?>
69
  </small>
70
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
71
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
73
  <?php endforeach; ?>
74
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
75
  <small>
76
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
77
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
78
  <?php endforeach; ?>
79
  </small>
80
  <?php endif; ?>
93
  <?php endif; ?>
94
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
95
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
96
+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
97
  <?php else: ?>
98
  <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
99
  <?php endif; ?>
102
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
103
  <small>
104
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
106
  <?php endforeach; ?>
107
  </small>
108
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
118
  <?php endif; ?>
119
 
120
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
121
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
122
  <?php endif; ?>
123
  <?php endif; ?>
124
  <?php endif; ?>
app/design/frontend/base/default/template/email/productalert/price.phtml CHANGED
@@ -23,25 +23,30 @@
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
- <?php if ($_products = $this->getProducts()): ?>
28
  <p><?php echo $this->__('You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:') ?></p>
29
  <table>
30
- <?php foreach ($_products as $_product): ?>
31
  <tr>
32
- <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $_product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
33
  <td>
34
- <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
35
- <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
36
- <p><small><?php echo $shortDescription ?></small></p>
 
37
  <?php endif; ?>
38
- <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
39
- <?php echo $this->__('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo Mage::helper('core')->currency($_product->getPrice()) ?></strong><br />
40
- <strong><?php echo $this->__('Special price:') ?> <span style="color:#FF0000;"><?php echo Mage::helper('core')->currency($_product->getFinalPrice()) ?></span></strong>
41
  <?php else: ?>
42
- <strong><?php echo $this->__('Price:') ?></strong> <?php echo Mage::helper('core')->currency($_product->getPrice()) ?>
43
  <?php endif; ?></p>
44
- <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($_product->getId()) ?>"><?php echo $this->__('Click here not to receive alerts for this product') ?></a></small></p>
45
  </td>
46
  </tr>
47
  <?php endforeach; ?>
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
+ * @var $this Mage_ProductAlert_Block_Email_Price
29
+ */
30
  ?>
31
+ <?php if ($products = $this->getProducts()): ?>
32
  <p><?php echo $this->__('You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:') ?></p>
33
  <table>
34
+ <?php foreach ($products as $product): ?>
35
  <tr>
36
+ <td><a href="<?php echo $product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><img src="<?php echo $product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a></td>
37
  <td>
38
+ <p><a href="<?php echo $product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($product->getName()) ?></strong></a></p>
39
+ <?php $shortDescription = $this->_getFilteredProductShortDescription($product) ?>
40
+ <?php if ($shortDescription): ?>
41
+ <p><small><?php echo $shortDescription ?></small></p>
42
  <?php endif; ?>
43
+ <p><?php if ($product->getPrice() != $product->getFinalPrice()): ?>
44
+ <?php echo $this->__('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo Mage::helper('core')->currency($product->getPrice()) ?></strong><br />
45
+ <strong><?php echo $this->__('Special price:') ?> <span style="color:#FF0000;"><?php echo Mage::helper('core')->currency($product->getFinalPrice()) ?></span></strong>
46
  <?php else: ?>
47
+ <strong><?php echo $this->__('Price:') ?></strong> <?php echo Mage::helper('core')->currency($product->getPrice()) ?>
48
  <?php endif; ?></p>
49
+ <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($product->getId()) ?>"><?php echo $this->__('Click here not to receive alerts for this product') ?></a></small></p>
50
  </td>
51
  </tr>
52
  <?php endforeach; ?>
app/design/frontend/base/default/template/email/productalert/stock.phtml CHANGED
@@ -23,25 +23,30 @@
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
- <?php if ($_products = $this->getProducts()): ?>
28
  <p><?php echo $this->__('You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:') ?></p>
29
  <table>
30
- <?php foreach ($_products as $_product): ?>
31
  <tr>
32
- <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($_product, 'thumbnail')->resize(75, 75) ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
33
  <td>
34
- <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
35
- <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
36
- <p><small><?php echo $shortDescription ?></small></p>
 
37
  <?php endif; ?>
38
- <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
39
- <?php echo $this->__('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo Mage::helper('core')->currency($_product->getPrice()) ?></strong><br />
40
- <strong><?php echo $this->__('Special price:') ?> <span style="color:#FF0000;"><?php echo Mage::helper('core')->currency($_product->getFinalPrice()) ?></span></strong>
41
  <?php else: ?>
42
- <strong><?php echo $this->__('Price:') ?></strong> <?php echo Mage::helper('core')->currency($_product->getPrice()) ?>
43
  <?php endif; ?></p>
44
- <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($_product->getId()) ?>"><?php echo $this->__('Click here not to receive alerts for this product') ?></a></small></p>
45
  </td>
46
  </tr>
47
  <?php endforeach; ?>
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
+ * @var $this Mage_ProductAlert_Block_Email_Stock
29
+ */
30
  ?>
31
+ <?php if ($products = $this->getProducts()): ?>
32
  <p><?php echo $this->__('You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:') ?></p>
33
  <table>
34
+ <?php foreach ($products as $product): ?>
35
  <tr>
36
+ <td><a href="<?php echo $product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><img src="<?php echo $this->helper('catalog/image')->init($product, 'thumbnail')->resize(75, 75) ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($product->getName()) ?>" /></a></td>
37
  <td>
38
+ <p><a href="<?php echo $product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($product->getName()) ?></strong></a></p>
39
+ <?php $shortDescription = $this->_getFilteredProductShortDescription($product) ?>
40
+ <?php if ($shortDescription): ?>
41
+ <p><small><?php echo $shortDescription ?></small></p>
42
  <?php endif; ?>
43
+ <p><?php if ($product->getPrice() != $product->getFinalPrice()): ?>
44
+ <?php echo $this->__('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo Mage::helper('core')->currency($product->getPrice()) ?></strong><br />
45
+ <strong><?php echo $this->__('Special price:') ?> <span style="color:#FF0000;"><?php echo Mage::helper('core')->currency($product->getFinalPrice()) ?></span></strong>
46
  <?php else: ?>
47
+ <strong><?php echo $this->__('Price:') ?></strong> <?php echo Mage::helper('core')->currency($product->getPrice()) ?>
48
  <?php endif; ?></p>
49
+ <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($product->getId()) ?>"><?php echo $this->__('Click here not to receive alerts for this product') ?></a></small></p>
50
  </td>
51
  </tr>
52
  <?php endforeach; ?>
app/design/frontend/base/default/template/googlecheckout/form.phtml DELETED
@@ -1,30 +0,0 @@
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
- <?php $_code=$this->getMethodCode() ?>
28
- <ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
29
- <li><?php echo $this->__('You will be redirected to the Google Checkout website when you place an order.') ?></li>
30
- </ul>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/googlecheckout/link.phtml DELETED
@@ -1,37 +0,0 @@
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
- <?php echo $this->getBeforeHtml(); ?>
28
- <?php if ($this->getIsDisabled()): ?>
29
- <img src="<?php echo $this->escapeHtml($this->getImageUrl())?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
30
- <?php else: ?>
31
- <form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
32
- <fieldset>
33
- <input type="hidden" name="analyticsdata" value="" />
34
- <input type="image" src="<?php echo $this->escapeHtml($this->getImageUrl())?>" title="<?php echo Mage::helper('googlecheckout')->__('Fast checkout through Google');?>" alt="<?php echo Mage::helper('googlecheckout')->__('Fast Checkout through Google');?>" />
35
- </fieldset>
36
- </form>
37
- <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/page/1column.phtml CHANGED
@@ -50,6 +50,7 @@
50
  </div>
51
  </div>
52
  <?php echo $this->getChildHtml('footer') ?>
 
53
  <?php echo $this->getChildHtml('before_body_end') ?>
54
  </div>
55
  </div>
50
  </div>
51
  </div>
52
  <?php echo $this->getChildHtml('footer') ?>
53
+ <?php echo $this->getChildHtml('global_cookie_notice') ?>
54
  <?php echo $this->getChildHtml('before_body_end') ?>
55
  </div>
56
  </div>
app/design/frontend/base/default/template/page/2columns-left.phtml CHANGED
@@ -51,6 +51,7 @@
51
  </div>
52
  </div>
53
  <?php echo $this->getChildHtml('footer') ?>
 
54
  <?php echo $this->getChildHtml('before_body_end') ?>
55
  </div>
56
  </div>
51
  </div>
52
  </div>
53
  <?php echo $this->getChildHtml('footer') ?>
54
+ <?php echo $this->getChildHtml('global_cookie_notice') ?>
55
  <?php echo $this->getChildHtml('before_body_end') ?>
56
  </div>
57
  </div>
app/design/frontend/base/default/template/page/2columns-right.phtml CHANGED
@@ -51,6 +51,7 @@
51
  </div>
52
  </div>
53
  <?php echo $this->getChildHtml('footer') ?>
 
54
  <?php echo $this->getChildHtml('before_body_end') ?>
55
  </div>
56
  </div>
51
  </div>
52
  </div>
53
  <?php echo $this->getChildHtml('footer') ?>
54
+ <?php echo $this->getChildHtml('global_cookie_notice') ?>
55
  <?php echo $this->getChildHtml('before_body_end') ?>
56
  </div>
57
  </div>
app/design/frontend/base/default/template/page/3columns.phtml CHANGED
@@ -54,6 +54,7 @@
54
  </div>
55
  </div>
56
  <?php echo $this->getChildHtml('footer') ?>
 
57
  <?php echo $this->getChildHtml('before_body_end') ?>
58
  </div>
59
  </div>
54
  </div>
55
  </div>
56
  <?php echo $this->getChildHtml('footer') ?>
57
+ <?php echo $this->getChildHtml('global_cookie_notice') ?>
58
  <?php echo $this->getChildHtml('before_body_end') ?>
59
  </div>
60
  </div>
app/design/frontend/base/default/template/page/html/cookienotice.phtml ADDED
@@ -0,0 +1,54 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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
+ <?php
28
+ /**
29
+ * @see Mage_Page_Block_Html_CookieNotice
30
+ */
31
+ ?>
32
+ <?php if (Mage::helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
33
+ <div class="global-site-notice notice-cookie" id="notice-cookie-block">
34
+ <div class="notice-inner">
35
+ <div class="notice-text"><?php echo $this->getCookieRestrictionBlockContent(); ?></div>
36
+ <div class="actions"><button class="button" onclick="allowSaveCookie()"><span><span><?php echo $this->__('Allow');?></span></span></button></div>
37
+ </div>
38
+ </div>
39
+ <script type="text/javascript">
40
+ /* <![CDATA[ */
41
+ function allowSaveCookie() {
42
+ Mage.Cookies.set('<?php echo Mage_Core_Helper_Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>', '<?php echo Mage::helper('core/cookie')->getAcceptedSaveCookiesWebsiteIds()?>', new Date(new Date().getTime() + <?php echo Mage::helper('core/cookie')->getCookieRestrictionLifetime() ?> * 1000));
43
+ if (Mage.Cookies.get('<?php echo Mage_Core_Helper_Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>')) {
44
+ window.location.reload();
45
+ } else {
46
+ window.location.href = '<?php echo Mage::getUrl('cms/index/noCookies')?>';
47
+ }
48
+ }
49
+ $('notice-cookie-block').show();
50
+ /* ]]> */
51
+ </script>
52
+ <?php endif; ?>
53
+
54
+
app/design/frontend/base/default/template/page/html/notices.phtml CHANGED
@@ -46,24 +46,3 @@
46
  <div class="notice-inner"><p><?php echo $this->__('This is a demo store. Any orders placed through this store will not be honored or fulfilled.') ?></p></div>
47
  </div>
48
  <?php endif; ?>
49
- <?php if (Mage::helper('core/cookie')->isUserNotAllowSaveCookie()): ?>
50
- <div class="global-site-notice notice-cookie" id="notice-cookie-block" style="display: none">
51
- <div class="notice-inner">
52
- <p><?php echo $this->__('This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our <a href="%s">Privacy Policy page</a>. To accept cookies from this site, please click the Allow button below.', $this->getPrivacyPolicyLink()) ?></p>
53
- <div class="actions"><button class="button" onclick="allowSaveCookie()"><span><span><?php echo $this->__('Allow');?></span></span></button></div>
54
- </div>
55
- </div>
56
- <script type="text/javascript">
57
- /* <![CDATA[ */
58
- function allowSaveCookie() {
59
- Mage.Cookies.set('<?php echo Mage_Core_Helper_Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>', '<?php echo Mage::helper('core/cookie')->getAcceptedSaveCookiesWebsiteIds()?>', new Date(new Date().getTime() + <?php echo Mage::helper('core/cookie')->getCookieRestrictionLifetime() ?> * 1000));
60
- if (Mage.Cookies.get('<?php echo Mage_Core_Helper_Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>')) {
61
- window.location.reload();
62
- } else {
63
- window.location.href = '<?php echo Mage::getUrl('cms/index/noCookies')?>';
64
- }
65
- }
66
- $('notice-cookie-block').show();
67
- /* ]]> */
68
- </script>
69
- <?php endif; ?>
46
  <div class="notice-inner"><p><?php echo $this->__('This is a demo store. Any orders placed through this store will not be honored or fulfilled.') ?></p></div>
47
  </div>
48
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/design/frontend/base/default/template/persistent/checkout/onepage/login.phtml CHANGED
@@ -72,6 +72,7 @@
72
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
73
  <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
74
  <fieldset>
 
75
  <h4><?php echo $this->__('Already registered?') ?></h4>
76
  <p><?php echo $this->__('Please log in below:') ?></p>
77
  <ul class="form-list">
72
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
73
  <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
74
  <fieldset>
75
+ <?php echo $this->getBlockHtml('formkey'); ?>
76
  <h4><?php echo $this->__('Already registered?') ?></h4>
77
  <p><?php echo $this->__('Please log in below:') ?></p>
78
  <ul class="form-list">
app/design/frontend/base/default/template/persistent/customer/form/login.phtml CHANGED
@@ -38,6 +38,7 @@
38
  </div>
39
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
40
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
 
41
  <div class="col2-set">
42
  <div class="col-1 new-users">
43
  <div class="content">
38
  </div>
39
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
40
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
41
+ <?php echo $this->getBlockHtml('formkey'); ?>
42
  <div class="col2-set">
43
  <div class="col-1 new-users">
44
  <div class="content">
app/design/frontend/base/default/template/review/form.phtml CHANGED
@@ -28,6 +28,7 @@
28
  <h2><?php echo $this->__('Write Your Own Review') ?></h2>
29
  <?php if ($this->getAllowWriteReviewFlag()): ?>
30
  <form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
 
31
  <fieldset>
32
  <?php echo $this->getChildHtml('form_fields_before')?>
33
  <h3><?php echo $this->__("You're reviewing:"); ?> <span><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></span></h3>
28
  <h2><?php echo $this->__('Write Your Own Review') ?></h2>
29
  <?php if ($this->getAllowWriteReviewFlag()): ?>
30
  <form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
31
+ <?php echo $this->getBlockHtml('formkey'); ?>
32
  <fieldset>
33
  <?php echo $this->getChildHtml('form_fields_before')?>
34
  <h3><?php echo $this->__("You're reviewing:"); ?> <span><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></span></h3>
app/design/frontend/base/default/template/sales/order/creditmemo/items/renderer/default.phtml CHANGED
@@ -27,265 +27,294 @@
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
- <?php if($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
- <?php foreach ($_options as $_option) : ?>
34
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
- <?php if (!$this->getPrintStatus()): ?>
36
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
39
- <div class="truncated_full_value">
40
- <dl class="item-options">
41
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43
- </dl>
44
- </div>
45
- <?php endif; ?>
46
- </dd>
47
- <?php else: ?>
48
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
49
- <?php endif; ?>
50
- <?php endforeach; ?>
51
  </dl>
52
- <?php endif; ?>
53
- <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
54
- <?php if ($addInfoBlock) :?>
55
- <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
56
- <?php endif; ?>
57
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
58
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
59
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
60
- <?php endif; ?>
61
- </td>
62
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
63
- <td class="a-right">
64
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
65
- <span class="price-excl-tax">
 
66
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
67
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
68
  <span class="cart-price">
69
  <?php endif; ?>
70
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
71
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
72
  </span>
73
  <?php endif; ?>
74
  <?php endif; ?>
75
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
76
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
77
  <?php else: ?>
78
- <span class="cart-price">
79
  <?php endif; ?>
80
 
81
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
82
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
83
- <?php else: ?>
84
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
85
- <?php endif; ?>
86
 
87
  </span>
88
 
89
 
90
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
91
 
92
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
93
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
94
  <small>
95
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
96
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
97
- <?php endforeach; ?>
 
98
  </small>
99
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
100
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
101
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
102
  <?php endforeach; ?>
103
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
104
  <small>
105
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
106
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
107
- <?php endforeach; ?>
 
108
  </small>
109
  <?php endif; ?>
110
  </span>
111
 
112
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
113
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
114
- <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>
 
 
115
  </span>
116
- <?php endif; ?>
117
  <?php endif; ?>
 
118
  </span>
119
- <br />
120
  <?php endif; ?>
121
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
122
- <span class="price-incl-tax">
123
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
124
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
  <span class="cart-price">
126
  <?php endif; ?>
127
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
128
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
129
  </span>
130
  <?php endif; ?>
131
  <?php endif; ?>
132
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
133
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
134
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
135
  <?php else: ?>
136
- <span class="cart-price">
137
  <?php endif; ?>
138
 
139
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
140
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
141
- <?php else: ?>
142
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
143
- <?php endif; ?>
144
 
145
  </span>
146
 
147
 
148
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
149
 
150
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
151
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
152
  <small>
153
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
154
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
155
- <?php endforeach; ?>
 
156
  </small>
157
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
158
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
159
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
160
  <?php endforeach; ?>
161
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
162
  <small>
163
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
164
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
165
- <?php endforeach; ?>
 
166
  </small>
167
  <?php endif; ?>
168
  </span>
169
 
170
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
171
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
172
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
173
  </span>
174
  <?php endif; ?>
175
  <?php endif; ?>
176
  </span>
177
- <?php endif; ?>
178
- </td>
179
- <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
180
- <td class="a-right">
181
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
182
- <span class="price-excl-tax">
183
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
184
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
185
  <span class="cart-price">
186
  <?php endif; ?>
187
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
188
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
189
  </span>
190
  <?php endif; ?>
191
  <?php endif; ?>
192
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
193
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
194
  <?php else: ?>
195
- <span class="cart-price">
196
  <?php endif; ?>
197
 
198
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
199
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
200
- <?php else: ?>
201
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
202
- <?php endif; ?>
203
 
204
  </span>
205
 
206
 
207
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
208
 
209
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
210
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
211
  <small>
212
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
213
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
214
- <?php endforeach; ?>
 
215
  </small>
216
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
218
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
219
  <?php endforeach; ?>
220
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
221
  <small>
222
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
223
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
224
- <?php endforeach; ?>
 
225
  </small>
226
  <?php endif; ?>
227
  </span>
228
 
229
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
230
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
231
- <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>
 
 
232
  </span>
233
- <?php endif; ?>
234
  <?php endif; ?>
 
235
  </span>
236
- <br />
237
  <?php endif; ?>
238
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
239
- <span class="price-incl-tax">
240
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
241
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
242
  <span class="cart-price">
243
  <?php endif; ?>
244
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
245
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
246
  </span>
247
  <?php endif; ?>
248
  <?php endif; ?>
249
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
250
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
252
  <?php else: ?>
253
- <span class="cart-price">
 
 
 
 
 
254
  <?php endif; ?>
255
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
256
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
257
- <?php else: ?>
258
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
259
- <?php endif; ?>
260
 
261
  </span>
262
 
263
 
264
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
265
 
266
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
267
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
268
  <small>
269
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
270
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
271
- <?php endforeach; ?>
 
272
  </small>
273
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
274
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
275
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
276
  <?php endforeach; ?>
277
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
278
  <small>
279
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
280
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
281
- <?php endforeach; ?>
 
282
  </small>
283
  <?php endif; ?>
284
  </span>
285
 
286
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
287
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
288
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
289
  </span>
290
  <?php endif; ?>
291
  <?php endif; ?>
@@ -293,10 +322,10 @@
293
 
294
 
295
  </span>
296
- <?php endif; ?>
297
- </td>
298
- <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
299
- <td class="last a-right">
300
- <?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
301
- </td>
302
  </tr>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
+ <?php if ($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
+ <?php foreach ($_options as $_option) : ?>
34
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
+ <?php if (!$this->getPrintStatus()): ?>
36
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
38
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
39
+ <div class="truncated_full_value">
40
+ <dl class="item-options">
41
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
42
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43
+ </dl>
44
+ </div>
45
+ <?php endif; ?>
46
+ </dd>
47
+ <?php else: ?>
48
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
49
+ <?php endif; ?>
50
+ <?php endforeach; ?>
51
  </dl>
52
+ <?php endif; ?>
53
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
54
+ <?php if ($addInfoBlock) : ?>
55
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
56
+ <?php endif; ?>
57
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
58
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
59
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link"
60
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
61
+ <?php endif; ?>
62
+ </td>
63
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
64
+ <td class="a-right">
65
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
66
+ <span class="price-excl-tax">
67
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
68
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
69
  <span class="cart-price">
70
  <?php endif; ?>
71
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
72
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
  </span>
74
  <?php endif; ?>
75
  <?php endif; ?>
76
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
77
+ <span class="cart-tax-total"
78
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
79
  <?php else: ?>
80
+ <span class="cart-price">
81
  <?php endif; ?>
82
 
83
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
85
+ <?php else: ?>
86
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
87
+ <?php endif; ?>
88
 
89
  </span>
90
 
91
 
92
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
93
 
94
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
95
+ style="display:none;">
96
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
97
  <small>
98
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
99
+ <span class="nobr"><?php echo $tax['title']; ?>
100
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
101
+ <?php endforeach; ?>
102
  </small>
103
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
104
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
105
+ <span class="nobr"><small><?php echo $tax['title']; ?>
106
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></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']; ?>
112
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
113
+ <?php endforeach; ?>
114
  </small>
115
  <?php endif; ?>
116
  </span>
117
 
118
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
119
+ <span class="cart-tax-total"
120
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
121
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
122
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
123
  </span>
 
124
  <?php endif; ?>
125
+ <?php endif; ?>
126
  </span>
127
+ <br/>
128
  <?php endif; ?>
129
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
130
+ <span class="price-incl-tax">
131
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
132
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
133
  <span class="cart-price">
134
  <?php endif; ?>
135
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
136
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
137
  </span>
138
  <?php endif; ?>
139
  <?php endif; ?>
140
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
141
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
+ <span class="cart-tax-total"
143
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
144
  <?php else: ?>
145
+ <span class="cart-price">
146
  <?php endif; ?>
147
 
148
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
150
+ <?php else: ?>
151
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
152
+ <?php endif; ?>
153
 
154
  </span>
155
 
156
 
157
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
158
 
159
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
160
+ style="display:none;">
161
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
162
  <small>
163
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
164
+ <span class="nobr"><?php echo $tax['title']; ?>
165
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
166
+ <?php endforeach; ?>
167
  </small>
168
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
169
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
170
+ <span class="nobr"><small><?php echo $tax['title']; ?>
171
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
172
  <?php endforeach; ?>
173
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
174
  <small>
175
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
176
+ <span class="nobr"><?php echo $tax['title']; ?>
177
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
178
+ <?php endforeach; ?>
179
  </small>
180
  <?php endif; ?>
181
  </span>
182
 
183
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
184
+ <span class="cart-tax-total"
185
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
186
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
187
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
188
  </span>
189
  <?php endif; ?>
190
  <?php endif; ?>
191
  </span>
192
+ <?php endif; ?>
193
+ </td>
194
+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
195
+ <td class="a-right">
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"
209
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
210
  <?php else: ?>
211
+ <span class="cart-price">
212
  <?php endif; ?>
213
 
214
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
215
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
216
+ <?php else: ?>
217
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
218
+ <?php endif; ?>
219
 
220
  </span>
221
 
222
 
223
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
224
 
225
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
226
+ style="display:none;">
227
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
228
  <small>
229
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
230
+ <span class="nobr"><?php echo $tax['title']; ?>
231
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
232
+ <?php endforeach; ?>
233
  </small>
234
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
235
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
236
+ <span class="nobr"><small><?php echo $tax['title']; ?>
237
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
238
  <?php endforeach; ?>
239
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
240
  <small>
241
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
242
+ <span class="nobr"><?php echo $tax['title']; ?>
243
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
244
+ <?php endforeach; ?>
245
  </small>
246
  <?php endif; ?>
247
  </span>
248
 
249
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
250
+ <span class="cart-tax-total"
251
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
252
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
253
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
254
  </span>
 
255
  <?php endif; ?>
256
+ <?php endif; ?>
257
  </span>
258
+ <br/>
259
  <?php endif; ?>
260
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
261
+ <span class="price-incl-tax">
262
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
263
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
264
  <span class="cart-price">
265
  <?php endif; ?>
266
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
267
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
268
  </span>
269
  <?php endif; ?>
270
  <?php endif; ?>
271
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
272
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
+ <span class="cart-tax-total"
274
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
275
  <?php else: ?>
276
+ <span class="cart-price">
277
+ <?php endif; ?>
278
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
279
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
280
+ <?php else: ?>
281
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
282
  <?php endif; ?>
 
 
 
 
 
283
 
284
  </span>
285
 
286
 
287
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
288
 
289
+ <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
290
+ style="display:none;">
291
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
292
  <small>
293
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
294
+ <span class="nobr"><?php echo $tax['title']; ?>
295
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
296
+ <?php endforeach; ?>
297
  </small>
298
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
299
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
300
+ <span class="nobr"><small><?php echo $tax['title']; ?>
301
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
302
  <?php endforeach; ?>
303
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
304
  <small>
305
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
306
+ <span class="nobr"><?php echo $tax['title']; ?>
307
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
308
+ <?php endforeach; ?>
309
  </small>
310
  <?php endif; ?>
311
  </span>
312
 
313
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
+ <span class="cart-tax-total"
315
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
316
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
317
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
318
  </span>
319
  <?php endif; ?>
320
  <?php endif; ?>
322
 
323
 
324
  </span>
325
+ <?php endif; ?>
326
+ </td>
327
+ <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
328
+ <td class="last a-right">
329
+ <?php echo $_order->formatPrice($_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()) ?>
330
+ </td>
331
  </tr>
app/design/frontend/base/default/template/sales/order/invoice/items/renderer/default.phtml CHANGED
@@ -27,266 +27,295 @@
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
- <?php if($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
- <?php foreach ($_options as $_option) : ?>
34
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
- <?php if (!$this->getPrintStatus()): ?>
36
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
38
- <?php echo $_formatedOptionValue['value'] ?>
39
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
40
- <div class="truncated_full_value">
41
- <dl class="item-options">
42
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44
- </dl>
45
- </div>
46
- <?php endif; ?>
47
- </dd>
48
- <?php else: ?>
49
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50
- <?php endif; ?>
51
- <?php endforeach; ?>
52
  </dl>
53
- <?php endif; ?>
54
- <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
55
- <?php if ($addInfoBlock) :?>
56
- <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
57
- <?php endif; ?>
58
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
59
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
60
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
61
- <?php endif; ?>
62
- </td>
63
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
64
- <td class="a-right">
65
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
66
- <span class="price-excl-tax">
 
67
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
68
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
69
  <span class="cart-price">
70
  <?php endif; ?>
71
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
72
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
  </span>
74
  <?php endif; ?>
75
  <?php endif; ?>
76
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
77
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
78
  <?php else: ?>
79
- <span class="cart-price">
80
  <?php endif; ?>
81
 
82
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
84
- <?php else: ?>
85
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
86
- <?php endif; ?>
87
 
88
  </span>
89
 
90
 
91
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
92
 
93
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
94
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
95
  <small>
96
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
97
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
98
- <?php endforeach; ?>
 
99
  </small>
100
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
103
  <?php endforeach; ?>
104
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
  <small>
106
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
107
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
108
- <?php endforeach; ?>
 
109
  </small>
110
  <?php endif; ?>
111
  </span>
112
 
113
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
114
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
115
- <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>
 
 
116
  </span>
117
- <?php endif; ?>
118
  <?php endif; ?>
 
119
  </span>
120
- <br />
121
  <?php endif; ?>
122
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
123
- <span class="price-incl-tax">
124
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
125
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
126
  <span class="cart-price">
127
  <?php endif; ?>
128
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
129
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
  </span>
131
  <?php endif; ?>
132
  <?php endif; ?>
133
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
134
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
135
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
136
  <?php else: ?>
137
- <span class="cart-price">
138
  <?php endif; ?>
139
 
140
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
142
- <?php else: ?>
143
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
144
- <?php endif; ?>
145
 
146
  </span>
147
 
148
 
149
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
150
 
151
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
152
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
153
  <small>
154
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
156
- <?php endforeach; ?>
 
157
  </small>
158
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
159
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
160
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
161
  <?php endforeach; ?>
162
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
163
  <small>
164
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
165
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
166
- <?php endforeach; ?>
 
167
  </small>
168
  <?php endif; ?>
169
  </span>
170
 
171
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
172
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
173
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
174
  </span>
175
  <?php endif; ?>
176
  <?php endif; ?>
177
  </span>
178
- <?php endif; ?>
179
- </td>
180
- <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
181
- <td class="a-right">
182
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
183
- <span class="price-excl-tax">
184
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
185
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
186
  <span class="cart-price">
187
  <?php endif; ?>
188
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
189
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
190
  </span>
191
  <?php endif; ?>
192
  <?php endif; ?>
193
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
194
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
195
  <?php else: ?>
196
- <span class="cart-price">
197
  <?php endif; ?>
198
 
199
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
200
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
201
- <?php else: ?>
202
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
203
- <?php endif; ?>
204
 
205
  </span>
206
 
207
 
208
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
209
 
210
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
211
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
212
  <small>
213
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
214
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
215
- <?php endforeach; ?>
 
216
  </small>
217
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
218
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
219
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
220
  <?php endforeach; ?>
221
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
222
  <small>
223
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
224
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
225
- <?php endforeach; ?>
 
226
  </small>
227
  <?php endif; ?>
228
  </span>
229
 
230
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
231
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
232
- <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>
 
 
233
  </span>
234
- <?php endif; ?>
235
  <?php endif; ?>
 
236
  </span>
237
- <br />
238
  <?php endif; ?>
239
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
240
- <span class="price-incl-tax">
241
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
242
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
  <span class="cart-price">
244
  <?php endif; ?>
245
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
246
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
247
  </span>
248
  <?php endif; ?>
249
  <?php endif; ?>
250
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
251
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
252
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
253
  <?php else: ?>
254
- <span class="cart-price">
 
 
 
 
 
255
  <?php endif; ?>
256
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
258
- <?php else: ?>
259
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
260
- <?php endif; ?>
261
 
262
  </span>
263
 
264
 
265
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
266
 
267
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
268
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
269
  <small>
270
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
271
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
272
- <?php endforeach; ?>
 
273
  </small>
274
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
275
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
276
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
277
  <?php endforeach; ?>
278
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
279
  <small>
280
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
281
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
282
- <?php endforeach; ?>
 
283
  </small>
284
  <?php endif; ?>
285
  </span>
286
 
287
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
288
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
289
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
290
  </span>
291
  <?php endif; ?>
292
  <?php endif; ?>
@@ -294,6 +323,6 @@
294
 
295
 
296
  </span>
297
- <?php endif; ?>
298
- </td>
299
  </tr>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
31
+ <?php if ($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
+ <?php foreach ($_options as $_option) : ?>
34
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
35
+ <?php if (!$this->getPrintStatus()): ?>
36
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
37
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
38
+ <?php echo $_formatedOptionValue['value'] ?>
39
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
40
+ <div class="truncated_full_value">
41
+ <dl class="item-options">
42
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44
+ </dl>
45
+ </div>
46
+ <?php endif; ?>
47
+ </dd>
48
+ <?php else: ?>
49
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
50
+ <?php endif; ?>
51
+ <?php endforeach; ?>
52
  </dl>
53
+ <?php endif; ?>
54
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
55
+ <?php if ($addInfoBlock) : ?>
56
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
57
+ <?php endif; ?>
58
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
59
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
60
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link"
61
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
62
+ <?php endif; ?>
63
+ </td>
64
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
65
+ <td class="a-right">
66
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
67
+ <span class="price-excl-tax">
68
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
69
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
70
  <span class="cart-price">
71
  <?php endif; ?>
72
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
73
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
74
  </span>
75
  <?php endif; ?>
76
  <?php endif; ?>
77
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
78
+ <span class="cart-tax-total"
79
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
80
  <?php else: ?>
81
+ <span class="cart-price">
82
  <?php endif; ?>
83
 
84
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
85
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
86
+ <?php else: ?>
87
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
88
+ <?php endif; ?>
89
 
90
  </span>
91
 
92
 
93
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
94
 
95
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
96
+ style="display:none;">
97
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
98
  <small>
99
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
100
+ <span class="nobr"><?php echo $tax['title']; ?>
101
+ : <?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']; ?>
107
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
108
  <?php endforeach; ?>
109
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
110
  <small>
111
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
112
+ <span class="nobr"><?php echo $tax['title']; ?>
113
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
114
+ <?php endforeach; ?>
115
  </small>
116
  <?php endif; ?>
117
  </span>
118
 
119
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
120
+ <span class="cart-tax-total"
121
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
122
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
123
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
124
  </span>
 
125
  <?php endif; ?>
126
+ <?php endif; ?>
127
  </span>
128
+ <br/>
129
  <?php endif; ?>
130
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
131
+ <span class="price-incl-tax">
132
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
133
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
134
  <span class="cart-price">
135
  <?php endif; ?>
136
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
137
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
138
  </span>
139
  <?php endif; ?>
140
  <?php endif; ?>
141
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
142
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
143
+ <span class="cart-tax-total"
144
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
145
  <?php else: ?>
146
+ <span class="cart-price">
147
  <?php endif; ?>
148
 
149
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
150
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
151
+ <?php else: ?>
152
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
153
+ <?php endif; ?>
154
 
155
  </span>
156
 
157
 
158
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
159
 
160
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
161
+ style="display:none;">
162
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
163
  <small>
164
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
165
+ <span class="nobr"><?php echo $tax['title']; ?>
166
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
167
+ <?php endforeach; ?>
168
  </small>
169
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
171
+ <span class="nobr"><small><?php echo $tax['title']; ?>
172
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
173
  <?php endforeach; ?>
174
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
175
  <small>
176
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
177
+ <span class="nobr"><?php echo $tax['title']; ?>
178
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
179
+ <?php endforeach; ?>
180
  </small>
181
  <?php endif; ?>
182
  </span>
183
 
184
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
185
+ <span class="cart-tax-total"
186
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
187
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
188
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
189
  </span>
190
  <?php endif; ?>
191
  <?php endif; ?>
192
  </span>
193
+ <?php endif; ?>
194
+ </td>
195
+ <td class="a-center"><?php echo $_item->getQty() * 1 ?> </td>
196
+ <td class="a-right">
197
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
198
+ <span class="price-excl-tax">
199
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
200
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
201
  <span class="cart-price">
202
  <?php endif; ?>
203
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
204
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
205
  </span>
206
  <?php endif; ?>
207
  <?php endif; ?>
208
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
209
+ <span class="cart-tax-total"
210
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
211
  <?php else: ?>
212
+ <span class="cart-price">
213
  <?php endif; ?>
214
 
215
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
216
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
217
+ <?php else: ?>
218
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
219
+ <?php endif; ?>
220
 
221
  </span>
222
 
223
 
224
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
225
 
226
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
227
+ style="display:none;">
228
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
229
  <small>
230
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
231
+ <span class="nobr"><?php echo $tax['title']; ?>
232
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
233
+ <?php endforeach; ?>
234
  </small>
235
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
236
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
237
+ <span class="nobr"><small><?php echo $tax['title']; ?>
238
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
239
  <?php endforeach; ?>
240
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
241
  <small>
242
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
243
+ <span class="nobr"><?php echo $tax['title']; ?>
244
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
245
+ <?php endforeach; ?>
246
  </small>
247
  <?php endif; ?>
248
  </span>
249
 
250
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
+ <span class="cart-tax-total"
252
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
253
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
254
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
255
  </span>
 
256
  <?php endif; ?>
257
+ <?php endif; ?>
258
  </span>
259
+ <br/>
260
  <?php endif; ?>
261
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
262
+ <span class="price-incl-tax">
263
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
264
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
265
  <span class="cart-price">
266
  <?php endif; ?>
267
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
268
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
269
  </span>
270
  <?php endif; ?>
271
  <?php endif; ?>
272
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
273
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
274
+ <span class="cart-tax-total"
275
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
276
  <?php else: ?>
277
+ <span class="cart-price">
278
+ <?php endif; ?>
279
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
280
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
281
+ <?php else: ?>
282
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
283
  <?php endif; ?>
 
 
 
 
 
284
 
285
  </span>
286
 
287
 
288
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
289
 
290
+ <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
291
+ style="display:none;">
292
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
293
  <small>
294
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
295
+ <span class="nobr"><?php echo $tax['title']; ?>
296
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
297
+ <?php endforeach; ?>
298
  </small>
299
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
300
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
301
+ <span class="nobr"><small><?php echo $tax['title']; ?>
302
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
303
  <?php endforeach; ?>
304
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
305
  <small>
306
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
307
+ <span class="nobr"><?php echo $tax['title']; ?>
308
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
309
+ <?php endforeach; ?>
310
  </small>
311
  <?php endif; ?>
312
  </span>
313
 
314
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
315
+ <span class="cart-tax-total"
316
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
317
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
318
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
319
  </span>
320
  <?php endif; ?>
321
  <?php endif; ?>
323
 
324
 
325
  </span>
326
+ <?php endif; ?>
327
+ </td>
328
  </tr>
app/design/frontend/base/default/template/sales/order/items/renderer/default.phtml CHANGED
@@ -81,7 +81,7 @@
81
  <?php endif; ?>
82
 
83
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
85
  <?php else: ?>
86
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
87
  <?php endif; ?>
@@ -100,12 +100,12 @@
100
  </small>
101
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
102
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
103
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
104
  <?php endforeach; ?>
105
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, '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']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
109
  <?php endforeach; ?>
110
  </small>
111
  <?php endif; ?>
@@ -139,7 +139,7 @@
139
  <?php endif; ?>
140
 
141
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
143
  <?php else: ?>
144
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
145
  <?php endif; ?>
@@ -153,7 +153,7 @@
153
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  <small>
155
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
156
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
157
  <?php endforeach; ?>
158
  </small>
159
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -171,7 +171,7 @@
171
 
172
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
173
  <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
174
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
175
  </span>
176
  <?php endif; ?>
177
  <?php endif; ?>
@@ -232,12 +232,12 @@
232
  </small>
233
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
234
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
235
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
236
  <?php endforeach; ?>
237
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
  <small>
239
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
240
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
241
  <?php endforeach; ?>
242
  </small>
243
  <?php endif; ?>
@@ -270,7 +270,7 @@
270
  <span class="cart-price">
271
  <?php endif; ?>
272
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
274
  <?php else: ?>
275
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
276
  <?php endif; ?>
@@ -284,7 +284,7 @@
284
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
  <small>
286
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
287
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
288
  <?php endforeach; ?>
289
  </small>
290
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -302,7 +302,7 @@
302
 
303
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
304
  <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
305
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
306
  </span>
307
  <?php endif; ?>
308
  <?php endif; ?>
81
  <?php endif; ?>
82
 
83
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
85
  <?php else: ?>
86
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
87
  <?php endif; ?>
100
  </small>
101
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
102
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
103
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
104
  <?php endforeach; ?>
105
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, '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']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
109
  <?php endforeach; ?>
110
  </small>
111
  <?php endif; ?>
139
  <?php endif; ?>
140
 
141
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
143
  <?php else: ?>
144
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
145
  <?php endif; ?>
153
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  <small>
155
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
156
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
157
  <?php endforeach; ?>
158
  </small>
159
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
171
 
172
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
173
  <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
174
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
175
  </span>
176
  <?php endif; ?>
177
  <?php endif; ?>
232
  </small>
233
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
234
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
235
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
236
  <?php endforeach; ?>
237
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
  <small>
239
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
240
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
241
  <?php endforeach; ?>
242
  </small>
243
  <?php endif; ?>
270
  <span class="cart-price">
271
  <?php endif; ?>
272
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
274
  <?php else: ?>
275
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
276
  <?php endif; ?>
284
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
  <small>
286
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
287
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
288
  <?php endforeach; ?>
289
  </small>
290
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
302
 
303
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
304
  <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
305
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
306
  </span>
307
  <?php endif; ?>
308
  <?php endif; ?>
app/design/frontend/base/default/template/tax/checkout/tax.phtml CHANGED
@@ -64,7 +64,7 @@
64
  <?php $weees = $this->getAllWeee(); ?>
65
  <?php foreach ($weees as $weeeTitle => $weeeAmount): ?>
66
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
67
- <td class="a-right" style="<?php echo $_style ?>" colspan="1">
68
  <?php echo $this->escapeHtml($weeeTitle); ?>
69
  <br />
70
  </td>
64
  <?php $weees = $this->getAllWeee(); ?>
65
  <?php foreach ($weees as $weeeTitle => $weeeAmount): ?>
66
  <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
67
+ <td class="a-right" style="<?php echo $_style ?>" colspan="<?php echo $this->getColspan(); ?>">
68
  <?php echo $this->escapeHtml($weeeTitle); ?>
69
  <br />
70
  </td>
app/design/frontend/base/default/template/tax/order/tax.phtml CHANGED
@@ -28,7 +28,9 @@
28
  $_order = $this->getOrder();
29
  $_source = $this->getSource();
30
  $_fullInfo = $_order->getFullTaxInfo();
 
31
  global $taxIter; $taxIter++;
 
32
  ?>
33
  <?php ?>
34
 
@@ -59,19 +61,34 @@
59
  </tr>
60
  <?php $isFirst = 0; ?>
61
  <?php $isTop = 0; ?>
 
62
  <?php endforeach; ?>
63
  <?php endforeach; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
64
  <?php endif;?>
65
 
66
- <?php if ($this->displayFullSummary() && $_fullInfo && !$this->getIsPlaneMode()): ?>
67
  <tr class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')">
68
- <?php elseif ($this->displayFullSummary() && $_fullInfo && $this->getIsPlaneMode()): ?>
69
  <tr class="show-details">
70
  <?php else: ?>
71
  <tr>
72
  <?php endif; ?>
73
  <td <?php echo $this->getLabelProperties()?>>
74
- <?php if ($this->displayFullSummary()): ?>
75
  <div class="summary-collapse"><?php echo $this->__('Tax'); ?></div>
76
  <?php else: ?>
77
  <?php echo $this->__('Tax'); ?>
28
  $_order = $this->getOrder();
29
  $_source = $this->getSource();
30
  $_fullInfo = $_order->getFullTaxInfo();
31
+ $_weees = $this->helper('tax')->getAllWeee($_order);
32
  global $taxIter; $taxIter++;
33
+ $hasItemsInTaxSection = 0;
34
  ?>
35
  <?php ?>
36
 
61
  </tr>
62
  <?php $isFirst = 0; ?>
63
  <?php $isTop = 0; ?>
64
+ <?php $hasItemsInTaxSection = 1 ?>
65
  <?php endforeach; ?>
66
  <?php endforeach; ?>
67
+
68
+ <?php foreach ($_weees as $weeeTitle => $weeeAmount): ?>
69
+ <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"<?php if (!$this->getIsPlaneMode()):?> style="display:none;"<?php endif;?>>
70
+ <td <?php echo $this->getLabelProperties()?>>
71
+ <?php echo $this->escapeHtml($weeeTitle); ?>
72
+ <br/>
73
+ </td>
74
+ <td <?php echo $this->getValueProperties()?> rowspan="1">
75
+ <?php echo $_order->formatPrice($weeeAmount); ?>
76
+ </td>
77
+ </tr>
78
+ <?php $hasItemsInTaxSection = 1 ?>
79
+ <?php endforeach; ?>
80
+
81
  <?php endif;?>
82
 
83
+ <?php if ($this->displayFullSummary() && $hasItemsInTaxSection && !$this->getIsPlaneMode()): ?>
84
  <tr class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')">
85
+ <?php elseif ($this->displayFullSummary() && $hasItemsInTaxSection && $this->getIsPlaneMode()): ?>
86
  <tr class="show-details">
87
  <?php else: ?>
88
  <tr>
89
  <?php endif; ?>
90
  <td <?php echo $this->getLabelProperties()?>>
91
+ <?php if ($this->displayFullSummary() && !$this->getIsPlaneMode()): ?>
92
  <div class="summary-collapse"><?php echo $this->__('Tax'); ?></div>
93
  <?php else: ?>
94
  <?php echo $this->__('Tax'); ?>
app/design/frontend/base/default/template/wishlist/view.phtml CHANGED
@@ -52,20 +52,36 @@
52
  </fieldset>
53
  </form>
54
 
 
 
 
 
 
 
 
 
55
  <script type="text/javascript">
56
  //<![CDATA[
57
- var wishlistForm = new Validation($('wishlist-view-form'));
58
- function addAllWItemsToCart() {
59
- var url = '<?php echo $this->getUrl('*/*/allcart', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>';
60
- var separator = (url.indexOf('?') >= 0) ? '&' : '?';
61
- $$('#wishlist-view-form .qty').each(
62
- function (input, index) {
63
- url += separator + input.name + '=' + encodeURIComponent(input.value);
64
- separator = '&';
65
- }
66
- );
67
- setLocation(url);
68
- }
 
 
 
 
 
 
 
 
69
  //]]>
70
  </script>
71
  </div>
52
  </fieldset>
53
  </form>
54
 
55
+ <form id="wishlist-allcart-form" action="<?php echo $this->getUrl('*/*/allcart') ?>" method="post">
56
+ <?php echo $this->getBlockHtml('formkey') ?>
57
+ <div class="no-display">
58
+ <input type="hidden" name="wishlist_id" id="wishlist_id" value="<?php echo $this->getWishlistInstance()->getId() ?>" />
59
+ <input type="hidden" name="qty" id="qty" value="" />
60
+ </div>
61
+ </form>
62
+
63
  <script type="text/javascript">
64
  //<![CDATA[
65
+ var wishlistForm = new Validation($('wishlist-view-form'));
66
+ var wishlistAllCartForm = new Validation($('wishlist-allcart-form'));
67
+
68
+ function calculateQty() {
69
+ var itemQtys = new Array();
70
+ $$('#wishlist-view-form .qty').each(
71
+ function (input, index) {
72
+ var idxStr = input.name;
73
+ var idx = idxStr.replace( /[^\d.]/g, '' );
74
+ itemQtys[idx] = input.value;
75
+ }
76
+ );
77
+
78
+ $$('#qty')[0].value = JSON.stringify(itemQtys);
79
+ }
80
+
81
+ function addAllWItemsToCart() {
82
+ calculateQty();
83
+ wishlistAllCartForm.form.submit();
84
+ }
85
  //]]>
86
  </script>
87
  </div>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Base_Default</name>
4
- <version>1.8.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a Magento themes base</summary>
10
  <description>This is a Magento themes base</description>
11
- <notes>1.8.0.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2013-09-24</date>
14
- <time>09:09:40</time>
15
- <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="7841e91642c07d049f6031c0a8b29968"/></dir><dir name="layout"><file name="authorizenet.xml" hash="ff4ae194cd550829d615f6626dfcacb3"/><file name="bundle.xml" hash="0990d5fb3da9521028ea1d507ac11ca7"/><file name="captcha.xml" hash="dbfae489e384e5f4509f91e7ce81be75"/><file name="cataloginventory.xml" hash="6cb9b9a4c99681b769e1ff439b55a0ce"/><file name="catalog_msrp.xml" hash="add0145199068eb0c16b3e03e7936b95"/><file name="catalogsearch.xml" hash="bd12d18c200b51e4f7fb4966fc467f38"/><file name="catalog.xml" hash="c12a09da3508982c50132a3fa6891739"/><file name="checkout.xml" hash="fe3715bb895566376aaf61c318fa848f"/><file name="cms.xml" hash="48e50d6294f859fa528278a7899d8c30"/><file name="contacts.xml" hash="c7c81f13d7deba797ede47e730278649"/><file name="core.xml" hash="b39a8c4b82a5a1fb34830e2763516efc"/><file name="customer.xml" hash="5bdf1625ffcdadf4d4f62600a566a15d"/><file name="directory.xml" hash="d30e05f8e4fe1eb024db1dbdcdd32414"/><file name="downloadable.xml" hash="41b9c74a3e787f07536e7ae24e5c8e80"/><file name="googleanalytics.xml" hash="7a34c27c3a4ec5f65aafe317d4e82f9a"/><file name="googlecheckout.xml" hash="fa4577aecbe0f36bce87e06bc652a062"/><file name="newsletter.xml" hash="c0043b6a9f5e6effe8ad9791c1d1c28a"/><file name="oauth.xml" hash="bfaded1209520e85687e4855114be425"/><file name="pagecache.xml" hash="ffa2ab2f6d87db688402cbefaf0bef19"/><file name="page.xml" hash="51344a8115e9c9b892e65be9a5de9b94"/><file name="payment.xml" hash="2d90077e1b2f846063a89c8aeb4d5fdb"/><file name="paypaluk.xml" hash="3fe895d16b62ad96476798a2e6077aab"/><file name="paypal.xml" hash="9aacf061f6056c66dcdb579a82660113"/><file name="persistent.xml" hash="55e430a56de4a4e62f94f045c4673bdc"/><file name="poll.xml" hash="ed6f016af222db0db3b17117977e87ac"/><file name="productalert.xml" hash="c83056d65e32214d23ae3b849ce849a4"/><file name="reports.xml" hash="0ed016155a3cf6bd366d482d92f41249"/><file name="review.xml" hash="435119eb74e4928c099e4b48ebfccf8a"/><file name="rss.xml" hash="16c16c677087920d3698e4e60b44b2b9"/><dir name="sales"><file name="billing_agreement.xml" hash="d510d75db1ce7fc999462e50be600497"/><file name="recurring_profile.xml" hash="052592ffb00251a440307c4e5a140ff7"/></dir><file name="sales.xml" hash="98042160869202debcf88e2b2c281b56"/><file name="sendfriend.xml" hash="12b612b48cda35223e36595179aefac1"/><file name="shipping.xml" hash="a2f266abff8dca19d01dc2d00e383a79"/><file name="tag.xml" hash="ffc5a935cb0713614fdfc9efc395fcfc"/><file name="weee.xml" hash="a4fc63dc72939c5180d288994d8da72b"/><file name="wishlist.xml" hash="cbbf15f8511ff6942be5a9a08225d787"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="4d3c5051c0d2c3c3c88dc516946947cd"/><file name="iframe.phtml" hash="6a628174882ee3db2bea73d72be15a2b"/><file name="info.phtml" hash="80267017d18a69690ffa2012bf16ea60"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="ccce44c73d5841fb4a220166e1a53776"/></dir><file name="price.phtml" hash="7a300519728802570c4918c7846f6bd6"/><dir name="view"><dir name="options"><file name="notice.phtml" hash="cac90dc8b9a94c42d710e5bbc8e39f61"/></dir><file name="price.phtml" hash="e19a7489377de3fe934f2ad8a8b4e40f"/><file name="tierprices.phtml" hash="156c0fb91c4293e798145896ba7954c8"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="60f522edfadba0412a2abdd7090e6da2"/><file name="multi.phtml" hash="84f0a9c4ce3bfa7b3196921e0e67e83b"/><file name="radio.phtml" hash="a7708d52e39e6e2361c0d868b50ac247"/><file name="select.phtml" hash="376be44e6e793aeae1104543e9eda969"/></dir><file name="options.phtml" hash="d015eefd779fa786b934c3c630c805fc"/></dir><file name="bundle.phtml" hash="bef57a41d87a39442be57a7c8b219b8c"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="459ee036059c16dd5c3af203d07b1264"/></dir><dir name="invoice"><file name="default.phtml" hash="a680f24fa94bfdad117e4aa350ec71ff"/></dir><dir name="order"><file name="default.phtml" hash="68613900f0e092ee5506d03c70b6f144"/></dir><dir name="shipment"><file name="default.phtml" hash="05585c1ccbee57dab08a358d31906c68"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="d9d4b6e1d4268459bb9112a4c2fd9e30"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="82137b4b7e19b3c8166703a9a9fcf44b"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="d35a83c2899d417c8837657ef9bd87e8"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="113506ee795061805ef490b747927230"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="6307c71651e7a91d3e6dfdfd64c25079"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/><file name="right_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/></dir><dir name="captcha"><file name="zend.phtml" hash="5480e8c35dd6124195fc71d85e86e2d9"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="514593d873876e3225a4b1ae3643abff"/><file name="view.phtml" hash="a07e819e74bbe444a6f1131dc3ccd142"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="e5ebf3a71e72ad751a5415d75e89ece4"/><file name="link_inline.phtml" hash="16609d7a742e10e72da22449f92054bf"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="eac743dbcd2d881c42b6f18ec704eae9"/><file name="state.phtml" hash="ed374b6ffb814b13e2eba6ef02e99efc"/><file name="view.phtml" hash="561f244e27b6f6017d1d5bc365242b27"/></dir><dir name="msrp"><file name="popup.phtml" hash="c08375903f3f11f2af8f3a5a007f0c92"/></dir><dir name="navigation"><file name="left.phtml" hash="39bedcb075360fdc2a399535a6e792ae"/><file name="top.phtml" hash="72623b9b9c6b58a7df91284862be17ff"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="19383cc23c8f6c9fe556cceebfc34c07"/><file name="sidebar.phtml" hash="2e6a4a82e082d235a9329959381c4414"/></dir><file name="gallery.phtml" hash="f1f89fa5e982cddbd506e80630a57d99"/><dir name="list"><file name="related.phtml" hash="9e1dfd894fa6f0ce6a88c4e0ef79e2a2"/><file name="toolbar.phtml" hash="197911bc8235bc39f5b5c87882724ecd"/><file name="upsell.phtml" hash="8dd3aab7ebd869c8d4f40099f4716506"/></dir><file name="list.phtml" hash="7d7da624243ec149c96a41df9132bdce"/><file name="new.phtml" hash="f2c93ef5f556ba94229eed83f58abb57"/><file name="price_msrp_item.phtml" hash="6bbc7f3e3c3b73e009bc0ab8838d3d40"/><file name="price_msrp_noform.phtml" hash="1692b20a230588ca548f1459c285cc74"/><file name="price_msrp.phtml" hash="283e07fdb0701feb006bc02edd3f23a9"/><file name="price_msrp_rss.phtml" hash="6ee30cbc86da3aeea4187810da10a9e9"/><file name="price.phtml" hash="111aedf46fee15d709028a3d0d47672e"/><dir name="view"><file name="additional.phtml" hash="5d113b63135e535c5b6fe5695dc94ded"/><file name="addtocart.phtml" hash="d8b6b397a4a04c3266c0c82391aa4acb"/><file name="addto.phtml" hash="a430465fcac701cb788916da08c52b90"/><file name="attributes.phtml" hash="c184b99a88f08fa50704c399a37fcfbc"/><file name="description.phtml" hash="4e920e324b0a0d366127a3ad99e2328d"/><file name="media.phtml" hash="1be8f4ea6e54f9a97e220f28931c4f50"/><dir name="options"><file name="js.phtml" hash="160fcd9f5eade825dfa8f4121aac9778"/><dir name="type"><file name="date.phtml" hash="78a303ab99f3361028053bf0b977b976"/><file name="default.phtml" hash="4c599ba00a9e7ab0e39768f0c49d52c3"/><file name="file.phtml" hash="3a7fe05c434ec81f68229ba5365095cc"/><file name="select.phtml" hash="4385f417292667d74616d113de034d4c"/><file name="text.phtml" hash="c041996450010583ae8759480f87d317"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="85655fc307d163ec6bffc07bef7f8924"/></dir><file name="wrapper.phtml" hash="a797d8924b27b63652255a8331bf8d44"/></dir><file name="options.phtml" hash="81a5b17ed13aabbca729c61b3f9b9111"/><file name="price_clone.phtml" hash="24e53a27dc39aa31afd2cdac7ab1656d"/><file name="price.phtml" hash="a6ab4e3bff155c7f2424568f60be1b89"/><file name="tierprices.phtml" hash="9eab82fafca8880c619276489bf99649"/><dir name="type"><file name="configurable.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="default.phtml" hash="cfab2e65accf5808fe352b52a00840de"/><file name="grouped.phtml" hash="a2cf1b972121dbee6a6159e0d13c180e"/><dir name="options"><file name="configurable.phtml" hash="08236b6638dc11992ab8da5385977271"/></dir><file name="simple.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="virtual.phtml" hash="e67c05bee0fa75df518c39929aa10187"/></dir></dir><file name="view.phtml" hash="de4d79d9f647634e02496a23f3ee7fbb"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="a6506809feaf1777e007864fc62ce26f"/><file name="link_inline.phtml" hash="351d332bd78df5f47bf6b66cb89a8297"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="f908f845e582dea293d4526ef729e396"/><file name="new_images_list.phtml" hash="3f263b467a58c306286e32332fbaab43"/><file name="new_names_list.phtml" hash="b09275eec939d91f6d20397c9d184691"/></dir><dir name="content"><file name="new_grid.phtml" hash="41602b4011288669a196e5c35309251c"/><file name="new_list.phtml" hash="6073d9562d08044588c8406a81890a39"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="1a1c258cb9a2561df2531a9a6d13d19f"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="9e809f0c7520508e73f22058ea127b3f"/></dir><file name="sitemap.phtml" hash="7e26f673c65ea756b09d7d2797bbaff9"/><file name="tree.phtml" hash="413ef1fa8c5e9943b1a44dd23ab9d69d"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="3b48f42619900ad7b7cbf191d55f0ee1"/><dir name="stockqty"><file name="composite.phtml" hash="825737ef425d3911dd663e8586b4f68c"/><file name="default.phtml" hash="c4646015a5d2203ce5bf422c1fc31485"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="d2f471111db7270891466b47ebef1ff7"/><file name="result.phtml" hash="5513b4ad4914f2b06c13983975e70faa"/></dir><file name="form.mini.phtml" hash="c6139cd74a134cb0d4364a4b0b53708f"/><file name="result.phtml" hash="fde05cf4fe8e540c5437820ec5edbbcf"/><file name="term.phtml" hash="32bf5a3d5960180b1c1603da350afa12"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="8a3f239d1f8afa5dfa3d45a1ca28baae"/><file name="crosssell.phtml" hash="186f8405ec7a86f7e48bfcb01adf7b2e"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="0fc6cc809c88704da74a915cf7e20918"/></dir><file name="default.phtml" hash="ef843033ce7057091a5eca85723f40be"/></dir><file name="noItems.phtml" hash="001f7d25b1c9468f532a13940fc8c7bb"/><dir name="render"><file name="default.phtml" hash="f5b6d21f8a80455daab898ea0f3f7c97"/><file name="simple.phtml" hash="15fb630f32aadbd48a892e8d90af3073"/></dir><file name="shipping.phtml" hash="6b774a841fc54c29a1f5d3a2af6a0944"/><dir name="sidebar"><file name="default.phtml" hash="b508e1e2007554fdd72570e9b1efbc92"/></dir><file name="sidebar.phtml" hash="8344c09dde70abe4e3b9c8861a1bb741"/><file name="totals.phtml" hash="5b69442fec9380e0e6d2afc6f95fd04a"/></dir><file name="cart.phtml" hash="34d41f366e05314baf7cbee9a37ad6bd"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="5298b1c3f448f03685fb8bd0df88d97b"/></dir><file name="addresses.phtml" hash="234be7957d9cdf739c06c714ba04c372"/><file name="agreements.phtml" hash="ff0beb153b284b2e3c58b4370a4b8401"/><dir name="billing"><file name="items.phtml" hash="cabfbfb5d33255a4750ccc3d55c358d6"/></dir><file name="billing.phtml" hash="281597e3e36ba83a13cdb4fb6bdbc3f8"/><dir name="item"><file name="default.phtml" hash="0ff34fc5d79d1bbe12fcf297b8280f08"/></dir><file name="link.phtml" hash="70249f4132c971ec5888690ffd092403"/><dir name="overview"><file name="item.phtml" hash="e83def5645dc64adef382b849c8fbdbb"/></dir><file name="overview.phtml" hash="bcdab97360c0938600c5a08249d81d17"/><file name="shipping.phtml" hash="568b9a00ba97c7db001cd894bae675a1"/><file name="state.phtml" hash="070912c23e8ff11f007e22306217f6d5"/><file name="success.phtml" hash="ae7f8dda179230945ace59db76f8b017"/></dir><dir name="onepage"><file name="agreements.phtml" hash="a8f762dd61914b2d9eab9fe9ada1945a"/><file name="billing.phtml" hash="3627f62972b124c21cbb08fd67458552"/><file name="failure.phtml" hash="0b95128399f2521bf12837aceaa31836"/><file name="link.phtml" hash="323dcf7f1acb91a186595b618592be86"/><file name="login.phtml" hash="ea2fbe290afcefdc0077ac42835899e7"/><dir name="payment"><file name="info.phtml" hash="e3d23f5d3e0b135ca38ec7ab5b41f851"/><file name="methods.phtml" hash="b88d2e4a2f375b5fb4a3983539b2e81e"/></dir><file name="payment.phtml" hash="0f2094bb3da954aa9405c1af7b66ae2a"/><dir name="progress"><file name="billing.phtml" hash="e0c20674a6831364b055424dac493acb"/><file name="payment.phtml" hash="2c5af1d7ea230faa3963781f85e9f610"/><file name="shipping_method.phtml" hash="1fbb3446280be2b2ce831e6b0b26fd80"/><file name="shipping.phtml" hash="b26f2b46e5c12cda8de4ecb37f98c355"/></dir><file name="progress.phtml" hash="3eab47ed120f6efd05f85294da825544"/><dir name="review"><file name="button.phtml" hash="d7a54917e7d0ceec6875760a3910452f"/><file name="info.phtml" hash="60c527a672dc8ed0afbe180c1105f65b"/><file name="item.phtml" hash="4ff6deeabbe76339f9914075e49cf798"/><file name="totals.phtml" hash="0acb66397e2d390de49dbdfca15d9804"/></dir><file name="review.phtml" hash="5ffdd3cc23815519462e3dcb1fc6b81a"/><dir name="shipping_method"><file name="additional.phtml" hash="7f8751c51089c14316694e2aa6c5357d"/><file name="available.phtml" hash="779142c301923119db60c08ad90d4e06"/></dir><file name="shipping_method.phtml" hash="ca5074b35e9a6167298a4a4433ecf98b"/><file name="shipping.phtml" hash="0dd2ceb18da2763395701c6379cb9a77"/></dir><file name="onepage.phtml" hash="b9c5a5a822652a0890be7e3e4f05d6b1"/><file name="success.phtml" hash="2e15bd609848f9da5edcece36b75ee45"/><dir name="total"><file name="default.phtml" hash="0ee253b9c15115a9db2cf53a67eeadf2"/><file name="nominal.phtml" hash="d377962c59bffbf7d21ced50f23c6d16"/><file name="tax.phtml" hash="df7b9274149d74ff7d6cc7fa356be35c"/></dir></dir><dir name="cms"><file name="content_heading.phtml" hash="a2b29b501b3a02f95bd98ad43bc53b42"/><file name="content.phtml" hash="1b278f7d9d4d4b2c4ba8294521a260a3"/><dir name="default"><file name="home.phtml" hash="4644ecd59a71f6233fddd4192acd9353"/><file name="no-route.phtml" hash="f168035d93340896f94b242c1f194dfe"/></dir><file name="meta.phtml" hash="5190e68694de60ffe0c2a01085dec99e"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="0d724d6e82b951b747ba6a871086f8fc"/><file name="link_inline.phtml" hash="37afb408b4a92d42f202dee6d9eb9fac"/></dir><dir name="static_block"><file name="default.phtml" hash="57690772a8cf7edad4ae7cc23ba8c2cc"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="e6466daa2d07ccb502ec163cf44ec2aa"/></dir><dir name="core"><file name="formkey.phtml" hash="eaa615a1b1e1095f104d4399d5c3c137"/><file name="link.phtml" hash="4bea6e43805d53027ee3a7528bb589a7"/><file name="messages.phtml" hash="da5cb19c11803db955f7b67d7b15eabc"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="0224cfb6bc389cae9d8e755d5ae91f81"/><file name="hello.phtml" hash="51393d123a78e7f6461aa0b4b3ee3691"/><file name="info.phtml" hash="27a57f2b321f63889c81aa0d75fabeb2"/><file name="newsletter.phtml" hash="689e47eeceff34400dd816449483a52e"/></dir><file name="dashboard.phtml" hash="07ce59e897cbadbab75d2cb5e69ee783"/><dir name="link"><file name="back.phtml" hash="966e18d09225d5ff1ee88139a0099455"/></dir><file name="navigation.phtml" hash="4fef6b277463f6cf1423b78016ff254a"/></dir><dir name="address"><file name="book.phtml" hash="f543dfa554dc389d8e0d9afce4574548"/><file name="edit.phtml" hash="4b853cf6b29231eb6add1a36ac73ffd8"/></dir><file name="address.phtml" hash="5e50f7e47656d3444c7e9069e4a1b902"/><file name="balance.phtml" hash="53aef61ff7baee49d1fb98861d424f33"/><dir name="form"><file name="address.phtml" hash="c284983647ff88bc457520c4acd5eb73"/><file name="changepassword.phtml" hash="29c707818823865b8bda3650ca5db11d"/><file name="confirmation.phtml" hash="2f1ce837f117b92cdec1b6d5cc48bb7f"/><file name="edit.phtml" hash="be4c7e278e89c04da9644386fa28696d"/><file name="forgotpassword.phtml" hash="4bda59c98f4e4e15b5a0e50b000800b1"/><file name="login.phtml" hash="57674faaf7006e1394e6f93bcc725519"/><file name="mini.login.phtml" hash="4c8bd38cd60f0de82f9e7c3450daac96"/><file name="newsletter.phtml" hash="33fd42a293e1f5e77d6d2cb2fb28b43d"/><file name="register.phtml" hash="2c5c3f29fb871006e0e54d14848bb3bd"/><file name="resetforgottenpassword.phtml" hash="462bf691601ec16fdda473db7a1ec1cd"/></dir><file name="logout.phtml" hash="4229e8c56b3abc016508579fa7a52c58"/><file name="orders.phtml" hash="13dec0788ff69f76f4a22bb42cff9004"/><dir name="widget"><file name="dob.phtml" hash="06d96d0861b9d6108a1a9f9a3a170fe6"/><file name="gender.phtml" hash="0e9a12d1cbe0a95c3539eb44395a62a1"/><file name="name.phtml" hash="f131bfd60b490899b025fe57663fe69c"/><file name="taxvat.phtml" hash="3bdbc005510b72cdd019624c971fa856"/></dir><file name="wishlist.phtml" hash="fdc628e68f98fb9fe09239c4d02eab31"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="6972ec9db0f291af6152876b0569e96a"/></dir><file name="currency.phtml" hash="e09f79b1fe19a3b0cc7bb1f93cd9df78"/><dir name="js"><file name="optional_zip_countries.phtml" hash="8298aa27f9789c72889abe31e89a0486"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="3c8cdd1ef8ea1e180de3c312545c61c5"/><file name="samples.phtml" hash="10a878cae989863fc18dab5d03a0cc94"/><file name="type.phtml" hash="e9cfafc367a9717d523269c40b9c9189"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="ca0b3b8a8b41dc94a6e067b11c60e2c4"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="a54c79fadd74281c5587ec6f5f05f357"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="14c6b556be54f187fa88e23eb73b1ad1"/></dir></dir><file name="success.phtml" hash="e80c2fd04c41c3d91c9269a960c7dcde"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="7eb6d898559355673e16e6a67994b03f"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="5308947330e4c8a5ea31a5f478117764"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="7f3d48155dc4034868099d8b64cafd56"/></dir><dir name="order"><file name="downloadable.phtml" hash="17e3f7933de13891e2a8512c872eea86"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="8534822f30d12582304bf178bf1f3a41"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="bc6351f6937774b9fb038b6372170d64"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b23b662e74345e8d059518f5edb2e736"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="b47aec2b2a04f851e011861858f666d6"/></dir><dir name="invoice"><file name="items.phtml" hash="9df2db8a77da02023105df3537c88fda"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4bf5d0461d82a4c08a8f4f8f05b84712"/></dir><dir name="invoice"><file name="default.phtml" hash="4bf5d0461d82a4c08a8f4f8f05b84712"/></dir><dir name="order"><file name="default.phtml" hash="4dbe3dc7374114ce8daace23f22aa14b"/></dir><dir name="shipment"><file name="default.phtml" hash="9fb9140adb3fd720c9ee824646fd81ef"/></dir></dir><file name="items.phtml" hash="82514c6dd6cf89a9fe4dcc5915f8a0f8"/><dir name="shipment"><file name="items.phtml" hash="790ac5faaec91f570504804048e19be0"/><file name="track.phtml" hash="092417894365f0bd0dd1de8f5418bf75"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="a06c3ff9a1407a2a700c640463b1c656"/><file name="stock.phtml" hash="d4f84e74595e86744dbd1591f724f061"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="64693c0a3e708784446c58bdf3fd2bad"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="c3f24c1411dd96ec0cb6da8cd4e5b54d"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="903b67370a02be2b5363324f9e7e9c41"/><file name="link.phtml" hash="1421dc98e10f043f9148b392b8084016"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="b6d89597fe6ab55f24f1db71928659ca"/></dir><dir name="oauth"><dir name="authorize"><file name="button.phtml" hash="ab630b4316878e341c0611cfa51650aa"/><file name="button-simple.phtml" hash="b4106ed8604d849314aecdea831ca6fa"/><file name="confirm.phtml" hash="563d76e574a1a6c43945479c63ae711e"/><file name="confirm-simple.phtml" hash="80423693a0a07b13a9dbc5507fe74847"/><dir name="form"><file name="login.phtml" hash="98743d533dea9a5dca05f3474bd6dc3c"/><file name="login-simple.phtml" hash="7b80dd4355187f7fbbfcfd6c05e8ae41"/></dir><file name="head-simple.phtml" hash="bfd2884d2c8af4315dd919ced20235cc"/><file name="reject.phtml" hash="51593eb4eba331894dffb67c4ca2bce2"/><file name="reject-simple.phtml" hash="b5b7d2623b16e56ddc95fef5a5e7a2ac"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="0ed2ae29b0489f2dec0a6af03010fff5"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="2ea1a339be90ced29b095ca4ceddcba4"/><file name="2columns-left.phtml" hash="b491cac040becb6be61d32d4ceadee79"/><file name="2columns-right.phtml" hash="c1767fa0eee114712a1ca8411795a3aa"/><file name="3columns.phtml" hash="207dff942b8b91987d19155f7a8a7009"/><file name="empty.phtml" hash="11d6841d6dfa2ad0c366fb11c26068af"/><dir name="html"><file name="breadcrumbs.phtml" hash="c034a339ee600b805c6271c83225944a"/><file name="footer.phtml" hash="4561fac2fb6e8c722a3f5be2825de65b"/><file name="header.phtml" hash="8dcf15fb7a3ef937b0ffeb2efcb7b4f3"/><file name="head.phtml" hash="8414479731562425a7dc6641486e74c5"/><file name="notices.phtml" hash="c3bf7f3cef2471eed531a3f35c98527f"/><file name="pager.phtml" hash="46cf49b484921cdacc6284bd8d1ff048"/><file name="top.links.phtml" hash="c5c2f18a6e5184206a2150dc58c01d04"/><file name="topmenu.phtml" hash="c7393f747b618c4668d5b5f39157232a"/><file name="wrapper.phtml" hash="99122df71779b8bf5146a6b0c40593d5"/></dir><dir name="js"><file name="calendar.phtml" hash="9461fd7deda2495b743ce17d405ecb28"/><file name="cookie.phtml" hash="ad57ca0a6409b2ce90448ae7c548e83f"/></dir><file name="popup.phtml" hash="97e855dcb940403ba9d3bcd64aa548de"/><file name="print.phtml" hash="e64d12aab7f325867fbaa303b8517307"/><file name="redirect.phtml" hash="8c3df16330cc29e52af3e13f32362e0c"/><dir name="switch"><file name="flags.phtml" hash="3d6dc469f573506ff0ed3b7258b23dbc"/><file name="languages.phtml" hash="f6c946bedc1e648efd462a8d7c029df4"/><file name="stores.phtml" hash="8d267ab0070362e52e37e5673bddf2c2"/></dir><dir name="template"><file name="container.phtml" hash="78db3f910f9f854d543cc803d72ca46c"/><file name="linksblock.phtml" hash="162aa23949d5aafa5b97ee383a59a102"/><file name="links.phtml" hash="1d4ec456ca6dbdc096e83ac2301f6fa5"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="5da6fe493e3e79ccd5a2fd8d9bd85f0f"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="a09ab0c7cd31ed6ee0baedb13dbae9ac"/></dir><dir name="info"><file name="cc.phtml" hash="c8e65d6b2aa010bbe9b204ab107f6157"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="8fc392586cb4c66764382ffbc20a9393"/><file name="schedule.phtml" hash="fd48d09a03580f4a4f2f98f86de8b54a"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="01644d6cf993bc5cfe2632e5a5bfdcc2"/><file name="cashondelivery.phtml" hash="9e55096120edfec835e07482bc483096"/><file name="cc.phtml" hash="23ec898742ca57a628437f21bd6101ea"/><file name="ccsave.phtml" hash="b52e20c18cf71c8200e46193cb51e58f"/><file name="checkmo.phtml" hash="9e0b5fe468c281f82f4ec1351f084e02"/><file name="purchaseorder.phtml" hash="ff79af2ed766da3a9e412b4b438b0377"/></dir><dir name="info"><file name="banktransfer.phtml" hash="e2403ade862ab927944c0d67982bed40"/><file name="checkmo.phtml" hash="df97b19db1e1c0bfc991f3d230bf00a2"/><file name="default.phtml" hash="41c1d133402c8274dd78bad60a89fbc8"/><file name="purchaseorder.phtml" hash="11574613b69778e02e20a7b1767512c4"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="address.phtml" hash="0ceee8f979be1d6a44ed6919af122016"/><file name="details.phtml" hash="d9cfdaa646d2d6693002bf6f00064201"/><dir name="shipping"><file name="method.phtml" hash="f71cbdfc5a8fe543eb03c8475a1818d3"/></dir></dir><file name="review.phtml" hash="0ee4d1c4e2055ca9050ef964b4ac0a94"/><file name="shortcut.phtml" hash="227924ef1ed156953734d44c0a0cfda0"/></dir><dir name="hss"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="700aa309bc3e2cb15fc5969204df470d"/><file name="info.phtml" hash="6ae7f528f71dc914365a9c638b61520d"/><file name="js.phtml" hash="4e57e37572a7c69e1e6c8e479a6950c1"/><file name="redirect.phtml" hash="c89c02eae033723d9fd5f8a8db70f80a"/><dir name="review"><file name="button.phtml" hash="359132746414e4ae696ba6047e2d3e98"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="831fa2f4041657c5c2f3eb4acf14f788"/></dir><dir name="payflowadvanced"><file name="form.phtml" hash="991804f0ad7a6871df9bed2529746c8a"/><file name="iframe.phtml" hash="f72cbcfa9e63a56ab8b78a0e4a403706"/><file name="info.phtml" hash="4bb273041a60c52e5428b453598886c2"/><file name="redirect.phtml" hash="6c2037bdfd6603e1cd9b911da70e75dd"/></dir><dir name="payflowlink"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="98df72e2f3a9bdc44c97d28bf02eef29"/><file name="info.phtml" hash="d2a18e1bfc3d3716f060962c198ec61a"/><file name="redirect.phtml" hash="e756182507ca509d1e2a396cf38ba639"/></dir><dir name="payment"><file name="mark.phtml" hash="0442986e7a40f3c2b9e7861edd206b3e"/><file name="redirect.phtml" hash="7de0a6668e72671ab6d10d08fc8e0070"/></dir></dir><dir name="paypaluk"><dir name="express"><file name="review.phtml" hash="7510838614cdbd9e15e0d26b958427c8"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="fc58c50dba0ecbd0c3caac7eeb43fbff"/><file name="login.phtml" hash="34b965fabb7762ac9e2c2738344c184f"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="ed3e797256dd9f9c06fa63c8cb315cca"/><file name="register.phtml" hash="ed544c1d7e80463bd8d03cfb8b3a934e"/></dir></dir><file name="remember_me.phtml" hash="3c2c3fd5313a71d4503b5bdd70cd9ff5"/><file name="remember_me_tooltip.phtml" hash="da09485dab530b5ebce8235e655329ec"/></dir><dir name="poll"><file name="active.phtml" hash="28ba7a63284f6b6fcc4c5be76e46e238"/><file name="result.phtml" hash="215fc6adbc8c4bb647723021576b3545"/></dir><dir name="productalert"><file name="price.phtml" hash="48125dd56110e5168a1693e5fba801c5"/><dir name="product"><file name="view.phtml" hash="7d502c7725566089a9ec824783cb4ace"/></dir><file name="stock.phtml" hash="48125dd56110e5168a1693e5fba801c5"/></dir><dir name="rating"><file name="detailed.phtml" hash="fd0413a654744d23ce6eea412221a2e4"/><file name="empty.phtml" hash="2b5189dccbaa36740993f45bd6f11214"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="3246ad747921cf31aece83e6ce55f759"/><file name="home_product_viewed.phtml" hash="a284ecdbfc6964004b0e4658620ae2dd"/><file name="product_compared.phtml" hash="afc280da1526d6f2badb14671b5997db"/><file name="product_viewed.phtml" hash="865b89ca10602feaefca198b309b8d88"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="bd898d390260c74fa678b4b24c2e86a6"/><file name="compared_images_list.phtml" hash="1d109a4aa32b86a7e5569657c950fcd4"/><file name="compared_names_list.phtml" hash="d403f06d34f8bfda35fbbfec6a3dff13"/></dir><dir name="content"><file name="compared_grid.phtml" hash="e6b8367c27c67df49196836bd225d086"/><file name="compared_list.phtml" hash="822896f074525b39ab7eb6cfd392c16f"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="27b595aa16fabb2972a20f8b1e5743c5"/><file name="viewed_images_list.phtml" hash="af17684fe97e1ca6240d6e8320994aba"/><file name="viewed_names_list.phtml" hash="e27a188a161cfb6a6774545274c0698e"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="762882c24518862005f76bcb1eb31e01"/><file name="viewed_list.phtml" hash="6946d8b2c6bf6acbe5fa726270bc12e4"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="aa6b0ddc97f52f74d7309c508758c1a6"/><file name="recent.phtml" hash="db2da0952d12c186927fa0e5de73ef92"/><file name="view.phtml" hash="f829a98a214c59676589063ef427aadf"/></dir><file name="form.phtml" hash="00345bebc1480d567bf229ec31e89891"/><dir name="helper"><file name="summary.phtml" hash="7c15b7078c848df9d2346ccd1d13cad5"/><file name="summary_short.phtml" hash="3235ad0cf2262197433a415c30fcadc2"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="4330b226b0de0c1e151ea0e8cfc60bec"/><file name="list.phtml" hash="c45ef4b227ce16adeac9a66cc41b236e"/><file name="other.phtml" hash="0f7a97276b6b495e1b3dedf488018625"/></dir></dir><file name="view.phtml" hash="0aeb91cca40ccadffc2cde36918af5d6"/></dir><dir name="rss"><file name="list.phtml" hash="639a0c032698bdf5078cfa3110f0919d"/><file name="nofeed.phtml" hash="6f6fc72b022ef05a3799070ba3677aeb"/><dir name="order"><file name="details.phtml" hash="2861b91f790d93c3fbe8981e2802adc9"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="15901f66f3d2cb13cc6cb48eb3878ca7"/></dir><file name="agreements.phtml" hash="4f3fbdec473f49180470e036042a19cd"/></dir><dir name="guest"><file name="form.phtml" hash="96cd89fe53104f88439d6825ec8196a9"/></dir><dir name="order"><file name="comments.phtml" hash="77f3e95650ad0f6a90f4cb6d163b6349"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="14ed3f65d83349b62f0becf2f018ae5a"/></dir></dir><file name="items.phtml" hash="986605cb8f6d86ecadb1bba6eef911ef"/></dir><file name="creditmemo.phtml" hash="dc24a51ef84241ec9a35b556311e70b7"/><file name="details.phtml" hash="7c34b1bff0d8de0276818dacc1b66d5f"/><file name="history.phtml" hash="3f3a7a713ce72e2e4060a70ee0c7c426"/><dir name="info"><file name="buttons.phtml" hash="cbb5bdeb8d78eb95b699b8c92b7404a0"/></dir><file name="info.phtml" hash="333fe60a5570c41928186065ef71b42c"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="da6c6fcb460db8fa518c78d1dbb48136"/></dir></dir><file name="items.phtml" hash="229ff219a495ae5ef2e56d8ce3b5d1f9"/></dir><file name="invoice.phtml" hash="373113354854d0ef46e044ff30254b5d"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="0808ea2e55731cf4dff9588c2913618d"/></dir></dir><file name="items.phtml" hash="94914e5aef876233b3f42f37e20d044c"/><dir name="print"><file name="creditmemo.phtml" hash="533dfad8bc9e4b8a93306bab2c91b53f"/><file name="invoice.phtml" hash="0a5dbf9447b2d78f2c73ca5941053cb8"/><file name="shipment.phtml" hash="679c12ad01f721514926cdf476d4567d"/></dir><file name="print.phtml" hash="8cd264b3b7a9adee78385a059d1b402b"/><file name="recent.phtml" hash="60e7a7e36a960f6a8380042a1880dacd"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="f6edf268e181e3213120d50a617ce56e"/></dir></dir><file name="items.phtml" hash="46e6bcda7059d1de070723b362e3ee2c"/></dir><file name="shipment.phtml" hash="91d67ce7e9014e7ac3414561dbe1a776"/><file name="totals.phtml" hash="3c18ba1dc8367621c8edca23b7bc7adf"/><file name="trackinginfo.phtml" hash="0132a39a5c29091406ac6e2ff5823ae3"/><file name="view.phtml" hash="514ca6354adfffc674a45863de4267b1"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="55e695e1f2a2e2a0a304be27c3feda0a"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="5dd2a80bdc5b6f821d92c05395a15ff6"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="5b6aa541b1a9f7c71ec0bbc4490264cc"/></dir><file name="view.phtml" hash="61f0a32de037e052e9d9cfe9d1c26371"/></dir><file name="profiles.phtml" hash="e1dbb7ff1be0313200119a133ca3b6ca"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="b598ad2c6dd06ce9fdd85bd0edc3e43c"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="4bd5afecd985f239e9b5e4a34d3f9083"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="7babde26ad2c6cce943d37da7a2d0b66"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="64ef10c5b304a1dc4ecb81ab7cab8f17"/><file name="popup.phtml" hash="f60fed812f2b7583cf523a9b9771134a"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="71b12c0baf6c2051e1352c8728decd1d"/><dir name="customer"><file name="recent.phtml" hash="06c5c4ea55dd8c4fdc21c084d2f4fc15"/><file name="tags.phtml" hash="1f9189426b1f55843aa6d7626a436661"/><file name="view.phtml" hash="f69f606ae1b530c8621d129570ff3f1a"/></dir><file name="list.phtml" hash="bdc85e7907f29b7d882629b1f1fe9c4a"/><file name="popular.phtml" hash="5acb50261292e223a1c2c2315c280e29"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="c3232e4e0e91d1e3d58fd5ccb0286d15"/><file name="grandtotal.phtml" hash="eb53b2a888da032176e3500feab7dac3"/><file name="shipping.phtml" hash="1a65fd85d96b84ec1f68930c53194fc6"/><file name="subtotal.phtml" hash="10c31870d3d53b269e431360e0e91963"/><file name="tax.phtml" hash="9bd7d2d16b3df413aff4da9c4cd14e2b"/></dir><dir name="order"><file name="tax.phtml" hash="b9f66bc0554932c2408d64b475537bdc"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="46fd019f2f64613834bc27588e6e0983"/><file name="tocart.phtml" hash="4b53bf90afa812a4ba1a31518cc174ee"/><file name="update.phtml" hash="b6d940e368b875082132220e8257e4c9"/></dir><dir name="email"><file name="items.phtml" hash="80006df1da4246533f72982231cbdced"/><file name="rss.phtml" hash="edfe5c16de2121d0526837966cda3da9"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="1f858cc0b01637cdc912a37ec72c2d77"/><file name="image.phtml" hash="db17bcd781abcd6d5ed353a71088105e"/><file name="info.phtml" hash="97c60f354ce7cfb3a1b5160673ae1e9b"/><file name="remove.phtml" hash="e6b9ea47c1fb9a1ed703e767fa62376f"/></dir><dir name="configure"><file name="addto.phtml" hash="2785e846cfc4f3f2ac670c6e7b75d4e7"/></dir><file name="list.phtml" hash="826c654a2414a4961f9e08e72e232fdc"/></dir><file name="options_list.phtml" hash="82edb5ed56d3bd797056aa7a2e07ff28"/><dir name="render"><dir name="item"><file name="price_msrp_item.phtml" hash="7a3c31fbf52d1f74b7ffb9ca25f79cb4"/><file name="price_msrp_rss.phtml" hash="288d268cce8b3c8a055ba19d5270f4e8"/><file name="price.phtml" hash="f47600f3dba84c055840a9ae2ea1934e"/></dir></dir><file name="shared.phtml" hash="07be81c4eb489e6c178b1659039a6de6"/><file name="sharing.phtml" hash="ac8d3b2f1752a7c6aa279faf96022363"/><file name="sidebar.phtml" hash="4fb9cfd8a5dddd98141374d9b1a04478"/><file name="view.phtml" hash="9bf78d4c0948784507f4a5c8bd33236f"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="4732f4eb6427aff580ed48ed524c9ccd"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="758eba2fa873bcd77d4bf60d5bddfc08"/><dir name="checkout"><file name="review.js" hash="689b8d6d30484eaca413d5303360ec81"/></dir><file name="giftmessage.js" hash="6e0d23b1b4c0f0a59abec709eb6b5dc4"/><file name="ie6.js" hash="46173fb9f7c45fd107ba4df4df397ffb"/><file name="msrp.js" hash="c22fa5f0f4bb239bfa44276fe674be72"/><file name="opcheckout.js" hash="c39c87c8f78abf7d0ab7fad3726de7d6"/></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="25386a0f30a2a185e728251733431f96"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Base_Default</name>
4
+ <version>1.8.1.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a Magento themes base</summary>
10
  <description>This is a Magento themes base</description>
11
+ <notes>1.8.1.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2013-11-22</date>
14
+ <time>04:16:46</time>
15
+ <contents><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="etc"><file name="widget.xml" hash="7841e91642c07d049f6031c0a8b29968"/></dir><dir name="layout"><file name="authorizenet.xml" hash="ff4ae194cd550829d615f6626dfcacb3"/><file name="bundle.xml" hash="0990d5fb3da9521028ea1d507ac11ca7"/><file name="captcha.xml" hash="dbfae489e384e5f4509f91e7ce81be75"/><file name="catalog.xml" hash="c12a09da3508982c50132a3fa6891739"/><file name="catalog_msrp.xml" hash="add0145199068eb0c16b3e03e7936b95"/><file name="cataloginventory.xml" hash="6cb9b9a4c99681b769e1ff439b55a0ce"/><file name="catalogsearch.xml" hash="bd12d18c200b51e4f7fb4966fc467f38"/><file name="checkout.xml" hash="fe3715bb895566376aaf61c318fa848f"/><file name="cms.xml" hash="48e50d6294f859fa528278a7899d8c30"/><file name="contacts.xml" hash="c7c81f13d7deba797ede47e730278649"/><file name="core.xml" hash="b39a8c4b82a5a1fb34830e2763516efc"/><file name="customer.xml" hash="5bdf1625ffcdadf4d4f62600a566a15d"/><file name="directory.xml" hash="d30e05f8e4fe1eb024db1dbdcdd32414"/><file name="downloadable.xml" hash="41b9c74a3e787f07536e7ae24e5c8e80"/><file name="googleanalytics.xml" hash="7480357f90eeb6a76b82433e17a6e8ea"/><file name="newsletter.xml" hash="c0043b6a9f5e6effe8ad9791c1d1c28a"/><file name="oauth.xml" hash="bfaded1209520e85687e4855114be425"/><file name="page.xml" hash="01f6d2b975d552155d9794e8315d9e3b"/><file name="pagecache.xml" hash="ffa2ab2f6d87db688402cbefaf0bef19"/><file name="payment.xml" hash="2d90077e1b2f846063a89c8aeb4d5fdb"/><file name="paypal.xml" hash="9aacf061f6056c66dcdb579a82660113"/><file name="paypaluk.xml" hash="3fe895d16b62ad96476798a2e6077aab"/><file name="persistent.xml" hash="55e430a56de4a4e62f94f045c4673bdc"/><file name="poll.xml" hash="ed6f016af222db0db3b17117977e87ac"/><file name="productalert.xml" hash="c83056d65e32214d23ae3b849ce849a4"/><file name="reports.xml" hash="0ed016155a3cf6bd366d482d92f41249"/><file name="review.xml" hash="435119eb74e4928c099e4b48ebfccf8a"/><file name="rss.xml" hash="16c16c677087920d3698e4e60b44b2b9"/><dir name="sales"><file name="billing_agreement.xml" hash="d510d75db1ce7fc999462e50be600497"/><file name="recurring_profile.xml" hash="052592ffb00251a440307c4e5a140ff7"/></dir><file name="sales.xml" hash="68882987045537ac282b592f9bbcfcbb"/><file name="sendfriend.xml" hash="12b612b48cda35223e36595179aefac1"/><file name="shipping.xml" hash="a2f266abff8dca19d01dc2d00e383a79"/><file name="tag.xml" hash="ffc5a935cb0713614fdfc9efc395fcfc"/><file name="weee.xml" hash="a4fc63dc72939c5180d288994d8da72b"/><file name="wishlist.xml" hash="cbbf15f8511ff6942be5a9a08225d787"/></dir><dir name="template"><dir name="authorizenet"><dir name="directpost"><file name="form.phtml" hash="4d3c5051c0d2c3c3c88dc516946947cd"/><file name="iframe.phtml" hash="6a628174882ee3db2bea73d72be15a2b"/><file name="info.phtml" hash="80267017d18a69690ffa2012bf16ea60"/></dir></dir><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="ccce44c73d5841fb4a220166e1a53776"/></dir><file name="price.phtml" hash="9f230886083cbb33f646e0dc263b83f7"/><dir name="view"><file name="option_tierprices.phtml" hash="d422bcdefd2c21d64ae6700922f2da23"/><dir name="options"><file name="notice.phtml" hash="cac90dc8b9a94c42d710e5bbc8e39f61"/></dir><file name="price.phtml" hash="7d6f447b1e866c8c5ecb7e60ecb9e26a"/><file name="tierprices.phtml" hash="156c0fb91c4293e798145896ba7954c8"/><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="60f522edfadba0412a2abdd7090e6da2"/><file name="multi.phtml" hash="84f0a9c4ce3bfa7b3196921e0e67e83b"/><file name="radio.phtml" hash="a7708d52e39e6e2361c0d868b50ac247"/><file name="select.phtml" hash="376be44e6e793aeae1104543e9eda969"/></dir><file name="options.phtml" hash="d015eefd779fa786b934c3c630c805fc"/></dir><file name="bundle.phtml" hash="f3c6b47970d8c9575ef9b55d743edc91"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4acbf431afe99fd88072ad93cd07ffc0"/></dir><dir name="invoice"><file name="default.phtml" hash="1712bc3c61309333d1b9f17a976c4a04"/></dir><dir name="order"><file name="default.phtml" hash="762f393603cf11b4a21f0186e03de1af"/></dir><dir name="shipment"><file name="default.phtml" hash="05585c1ccbee57dab08a358d31906c68"/></dir></dir></dir></dir><dir name="rss"><dir name="catalog"><dir name="product"><file name="price.phtml" hash="bb6c7db623a27e4718befd8e5557cc70"/></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="b79ebe99380266125913036371193ae2"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="d295e6c5e49a3bee4b594b754cb1d321"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="8183b247e250e65771e23d6d4128ac5b"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="6307c71651e7a91d3e6dfdfd64c25079"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/><file name="right_col.phtml" hash="2e560ea0fdde22566d59179b7b15b8e6"/></dir><dir name="captcha"><file name="zend.phtml" hash="5480e8c35dd6124195fc71d85e86e2d9"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="514593d873876e3225a4b1ae3643abff"/><file name="view.phtml" hash="a07e819e74bbe444a6f1131dc3ccd142"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="e5ebf3a71e72ad751a5415d75e89ece4"/><file name="link_inline.phtml" hash="16609d7a742e10e72da22449f92054bf"/></dir></dir></dir><dir name="layer"><file name="filter.phtml" hash="eac743dbcd2d881c42b6f18ec704eae9"/><file name="state.phtml" hash="ed374b6ffb814b13e2eba6ef02e99efc"/><file name="view.phtml" hash="561f244e27b6f6017d1d5bc365242b27"/></dir><dir name="msrp"><file name="popup.phtml" hash="c08375903f3f11f2af8f3a5a007f0c92"/></dir><dir name="navigation"><file name="left.phtml" hash="39bedcb075360fdc2a399535a6e792ae"/><file name="top.phtml" hash="72623b9b9c6b58a7df91284862be17ff"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="19383cc23c8f6c9fe556cceebfc34c07"/><file name="sidebar.phtml" hash="2e6a4a82e082d235a9329959381c4414"/></dir><file name="gallery.phtml" hash="f1f89fa5e982cddbd506e80630a57d99"/><dir name="list"><file name="related.phtml" hash="9e1dfd894fa6f0ce6a88c4e0ef79e2a2"/><file name="toolbar.phtml" hash="197911bc8235bc39f5b5c87882724ecd"/><file name="upsell.phtml" hash="8dd3aab7ebd869c8d4f40099f4716506"/></dir><file name="list.phtml" hash="7d7da624243ec149c96a41df9132bdce"/><file name="new.phtml" hash="f2c93ef5f556ba94229eed83f58abb57"/><file name="price.phtml" hash="0b276628ad5fd23227ccd11563fcbd68"/><file name="price_msrp.phtml" hash="283e07fdb0701feb006bc02edd3f23a9"/><file name="price_msrp_item.phtml" hash="6bbc7f3e3c3b73e009bc0ab8838d3d40"/><file name="price_msrp_noform.phtml" hash="1692b20a230588ca548f1459c285cc74"/><file name="price_msrp_rss.phtml" hash="6ee30cbc86da3aeea4187810da10a9e9"/><dir name="view"><file name="additional.phtml" hash="5d113b63135e535c5b6fe5695dc94ded"/><file name="addto.phtml" hash="a430465fcac701cb788916da08c52b90"/><file name="addtocart.phtml" hash="d8b6b397a4a04c3266c0c82391aa4acb"/><file name="attributes.phtml" hash="c184b99a88f08fa50704c399a37fcfbc"/><file name="description.phtml" hash="4e920e324b0a0d366127a3ad99e2328d"/><file name="media.phtml" hash="1be8f4ea6e54f9a97e220f28931c4f50"/><dir name="options"><file name="js.phtml" hash="160fcd9f5eade825dfa8f4121aac9778"/><dir name="type"><file name="date.phtml" hash="78a303ab99f3361028053bf0b977b976"/><file name="default.phtml" hash="4c599ba00a9e7ab0e39768f0c49d52c3"/><file name="file.phtml" hash="3a7fe05c434ec81f68229ba5365095cc"/><file name="select.phtml" hash="4385f417292667d74616d113de034d4c"/><file name="text.phtml" hash="c041996450010583ae8759480f87d317"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="85655fc307d163ec6bffc07bef7f8924"/></dir><file name="wrapper.phtml" hash="a797d8924b27b63652255a8331bf8d44"/></dir><file name="options.phtml" hash="81a5b17ed13aabbca729c61b3f9b9111"/><file name="price.phtml" hash="a6ab4e3bff155c7f2424568f60be1b89"/><file name="price_clone.phtml" hash="24e53a27dc39aa31afd2cdac7ab1656d"/><file name="tierprices.phtml" hash="9eab82fafca8880c619276489bf99649"/><dir name="type"><file name="configurable.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="default.phtml" hash="cfab2e65accf5808fe352b52a00840de"/><file name="grouped.phtml" hash="a2cf1b972121dbee6a6159e0d13c180e"/><dir name="options"><file name="configurable.phtml" hash="08236b6638dc11992ab8da5385977271"/></dir><file name="simple.phtml" hash="e67c05bee0fa75df518c39929aa10187"/><file name="virtual.phtml" hash="e67c05bee0fa75df518c39929aa10187"/></dir></dir><file name="view.phtml" hash="de4d79d9f647634e02496a23f3ee7fbb"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="a6506809feaf1777e007864fc62ce26f"/><file name="link_inline.phtml" hash="351d332bd78df5f47bf6b66cb89a8297"/></dir><dir name="new"><dir name="column"><file name="new_default_list.phtml" hash="f908f845e582dea293d4526ef729e396"/><file name="new_images_list.phtml" hash="3f263b467a58c306286e32332fbaab43"/><file name="new_names_list.phtml" hash="b09275eec939d91f6d20397c9d184691"/></dir><dir name="content"><file name="new_grid.phtml" hash="41602b4011288669a196e5c35309251c"/><file name="new_list.phtml" hash="6073d9562d08044588c8406a81890a39"/></dir></dir></dir></dir><dir name="rss"><dir name="product"><file name="price.phtml" hash="f180fb1ff3c6c86fee4db9c622a53290"/></dir></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="9e809f0c7520508e73f22058ea127b3f"/></dir><file name="sitemap.phtml" hash="7e26f673c65ea756b09d7d2797bbaff9"/><file name="tree.phtml" hash="413ef1fa8c5e9943b1a44dd23ab9d69d"/></dir></dir><dir name="cataloginventory"><file name="qtyincrements.phtml" hash="3b48f42619900ad7b7cbf191d55f0ee1"/><dir name="stockqty"><file name="composite.phtml" hash="825737ef425d3911dd663e8586b4f68c"/><file name="default.phtml" hash="c4646015a5d2203ce5bf422c1fc31485"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="d2f471111db7270891466b47ebef1ff7"/><file name="result.phtml" hash="5513b4ad4914f2b06c13983975e70faa"/></dir><file name="form.mini.phtml" hash="c6139cd74a134cb0d4364a4b0b53708f"/><file name="result.phtml" hash="fde05cf4fe8e540c5437820ec5edbbcf"/><file name="term.phtml" hash="32bf5a3d5960180b1c1603da350afa12"/></dir><dir name="checkout"><dir name="cart"><file name="coupon.phtml" hash="8a3f239d1f8afa5dfa3d45a1ca28baae"/><file name="crosssell.phtml" hash="186f8405ec7a86f7e48bfcb01adf7b2e"/><dir name="item"><dir name="configure"><file name="updatecart.phtml" hash="0fc6cc809c88704da74a915cf7e20918"/></dir><file name="default.phtml" hash="b4f61bb122c1d4335784b343ab83d66a"/></dir><file name="noItems.phtml" hash="001f7d25b1c9468f532a13940fc8c7bb"/><dir name="render"><file name="default.phtml" hash="f5b6d21f8a80455daab898ea0f3f7c97"/><file name="simple.phtml" hash="15fb630f32aadbd48a892e8d90af3073"/></dir><file name="shipping.phtml" hash="6b774a841fc54c29a1f5d3a2af6a0944"/><dir name="sidebar"><file name="default.phtml" hash="bd1f367e1e69e53a1d2b89a24c6c3909"/></dir><file name="sidebar.phtml" hash="8344c09dde70abe4e3b9c8861a1bb741"/><file name="totals.phtml" hash="5b69442fec9380e0e6d2afc6f95fd04a"/></dir><file name="cart.phtml" hash="446162e80280ddfdb1e2b9f1b3d36b42"/><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="5298b1c3f448f03685fb8bd0df88d97b"/></dir><file name="addresses.phtml" hash="234be7957d9cdf739c06c714ba04c372"/><file name="agreements.phtml" hash="ff0beb153b284b2e3c58b4370a4b8401"/><dir name="billing"><file name="items.phtml" hash="cabfbfb5d33255a4750ccc3d55c358d6"/></dir><file name="billing.phtml" hash="281597e3e36ba83a13cdb4fb6bdbc3f8"/><dir name="item"><file name="default.phtml" hash="0ff34fc5d79d1bbe12fcf297b8280f08"/></dir><file name="link.phtml" hash="70249f4132c971ec5888690ffd092403"/><dir name="overview"><file name="item.phtml" hash="ea7b056248d23e75c0666587ebe868ae"/></dir><file name="overview.phtml" hash="20c07dd1bcaf39c60b776e254229d6c8"/><file name="shipping.phtml" hash="568b9a00ba97c7db001cd894bae675a1"/><file name="state.phtml" hash="070912c23e8ff11f007e22306217f6d5"/><file name="success.phtml" hash="ae7f8dda179230945ace59db76f8b017"/></dir><dir name="onepage"><file name="agreements.phtml" hash="a8f762dd61914b2d9eab9fe9ada1945a"/><file name="billing.phtml" hash="3627f62972b124c21cbb08fd67458552"/><file name="failure.phtml" hash="0b95128399f2521bf12837aceaa31836"/><file name="link.phtml" hash="323dcf7f1acb91a186595b618592be86"/><file name="login.phtml" hash="923c114caf3bcaeea2adc266faa7de23"/><dir name="payment"><file name="info.phtml" hash="e3d23f5d3e0b135ca38ec7ab5b41f851"/><file name="methods.phtml" hash="b88d2e4a2f375b5fb4a3983539b2e81e"/></dir><file name="payment.phtml" hash="0f2094bb3da954aa9405c1af7b66ae2a"/><dir name="progress"><file name="billing.phtml" hash="e0c20674a6831364b055424dac493acb"/><file name="payment.phtml" hash="2c5af1d7ea230faa3963781f85e9f610"/><file name="shipping.phtml" hash="b26f2b46e5c12cda8de4ecb37f98c355"/><file name="shipping_method.phtml" hash="1fbb3446280be2b2ce831e6b0b26fd80"/></dir><file name="progress.phtml" hash="3eab47ed120f6efd05f85294da825544"/><dir name="review"><file name="button.phtml" hash="d7a54917e7d0ceec6875760a3910452f"/><file name="info.phtml" hash="60c527a672dc8ed0afbe180c1105f65b"/><file name="item.phtml" hash="ddc2e31e579d9e03e9360e614c1eab23"/><file name="totals.phtml" hash="0acb66397e2d390de49dbdfca15d9804"/></dir><file name="review.phtml" hash="5ffdd3cc23815519462e3dcb1fc6b81a"/><file name="shipping.phtml" hash="0dd2ceb18da2763395701c6379cb9a77"/><dir name="shipping_method"><file name="additional.phtml" hash="7f8751c51089c14316694e2aa6c5357d"/><file name="available.phtml" hash="779142c301923119db60c08ad90d4e06"/></dir><file name="shipping_method.phtml" hash="ca5074b35e9a6167298a4a4433ecf98b"/></dir><file name="onepage.phtml" hash="b9c5a5a822652a0890be7e3e4f05d6b1"/><file name="success.phtml" hash="2e15bd609848f9da5edcece36b75ee45"/><dir name="total"><file name="default.phtml" hash="0ee253b9c15115a9db2cf53a67eeadf2"/><file name="nominal.phtml" hash="d377962c59bffbf7d21ced50f23c6d16"/><file name="tax.phtml" hash="df7b9274149d74ff7d6cc7fa356be35c"/></dir></dir><dir name="cms"><file name="content.phtml" hash="1b278f7d9d4d4b2c4ba8294521a260a3"/><file name="content_heading.phtml" hash="a2b29b501b3a02f95bd98ad43bc53b42"/><dir name="default"><file name="home.phtml" hash="4644ecd59a71f6233fddd4192acd9353"/><file name="no-route.phtml" hash="f168035d93340896f94b242c1f194dfe"/></dir><file name="meta.phtml" hash="5190e68694de60ffe0c2a01085dec99e"/><dir name="widget"><dir name="link"><file name="link_block.phtml" hash="0d724d6e82b951b747ba6a871086f8fc"/><file name="link_inline.phtml" hash="37afb408b4a92d42f202dee6d9eb9fac"/></dir><dir name="static_block"><file name="default.phtml" hash="57690772a8cf7edad4ae7cc23ba8c2cc"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="e6466daa2d07ccb502ec163cf44ec2aa"/></dir><dir name="core"><file name="formkey.phtml" hash="eaa615a1b1e1095f104d4399d5c3c137"/><file name="link.phtml" hash="4bea6e43805d53027ee3a7528bb589a7"/><file name="messages.phtml" hash="da5cb19c11803db955f7b67d7b15eabc"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="0224cfb6bc389cae9d8e755d5ae91f81"/><file name="hello.phtml" hash="51393d123a78e7f6461aa0b4b3ee3691"/><file name="info.phtml" hash="27a57f2b321f63889c81aa0d75fabeb2"/><file name="newsletter.phtml" hash="689e47eeceff34400dd816449483a52e"/></dir><file name="dashboard.phtml" hash="07ce59e897cbadbab75d2cb5e69ee783"/><dir name="link"><file name="back.phtml" hash="966e18d09225d5ff1ee88139a0099455"/></dir><file name="navigation.phtml" hash="4fef6b277463f6cf1423b78016ff254a"/></dir><dir name="address"><file name="book.phtml" hash="f543dfa554dc389d8e0d9afce4574548"/><file name="edit.phtml" hash="4b853cf6b29231eb6add1a36ac73ffd8"/></dir><file name="address.phtml" hash="5e50f7e47656d3444c7e9069e4a1b902"/><file name="balance.phtml" hash="53aef61ff7baee49d1fb98861d424f33"/><dir name="form"><file name="address.phtml" hash="c284983647ff88bc457520c4acd5eb73"/><file name="changepassword.phtml" hash="29c707818823865b8bda3650ca5db11d"/><file name="confirmation.phtml" hash="2f1ce837f117b92cdec1b6d5cc48bb7f"/><file name="edit.phtml" hash="be4c7e278e89c04da9644386fa28696d"/><file name="forgotpassword.phtml" hash="4bda59c98f4e4e15b5a0e50b000800b1"/><file name="login.phtml" hash="4007eefca86c8645a9cc4c74f73de561"/><file name="mini.login.phtml" hash="4c8bd38cd60f0de82f9e7c3450daac96"/><file name="newsletter.phtml" hash="33fd42a293e1f5e77d6d2cb2fb28b43d"/><file name="register.phtml" hash="2c5c3f29fb871006e0e54d14848bb3bd"/><file name="resetforgottenpassword.phtml" hash="462bf691601ec16fdda473db7a1ec1cd"/></dir><file name="logout.phtml" hash="4229e8c56b3abc016508579fa7a52c58"/><file name="orders.phtml" hash="13dec0788ff69f76f4a22bb42cff9004"/><dir name="widget"><file name="dob.phtml" hash="06d96d0861b9d6108a1a9f9a3a170fe6"/><file name="gender.phtml" hash="0e9a12d1cbe0a95c3539eb44395a62a1"/><file name="name.phtml" hash="f131bfd60b490899b025fe57663fe69c"/><file name="taxvat.phtml" hash="3bdbc005510b72cdd019624c971fa856"/></dir><file name="wishlist.phtml" hash="fdc628e68f98fb9fe09239c4d02eab31"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="6972ec9db0f291af6152876b0569e96a"/></dir><file name="currency.phtml" hash="e09f79b1fe19a3b0cc7bb1f93cd9df78"/><dir name="js"><file name="optional_zip_countries.phtml" hash="8298aa27f9789c72889abe31e89a0486"/></dir></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="3c8cdd1ef8ea1e180de3c312545c61c5"/><file name="samples.phtml" hash="10a878cae989863fc18dab5d03a0cc94"/><file name="type.phtml" hash="e9cfafc367a9717d523269c40b9c9189"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="25d2b797afde37a8b5c1b3f7572d7c79"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="a54c79fadd74281c5587ec6f5f05f357"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="e79ca7433c65f0090c53825475582347"/></dir></dir><file name="success.phtml" hash="e80c2fd04c41c3d91c9269a960c7dcde"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="7eb6d898559355673e16e6a67994b03f"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="f117ed6a4e568af3c6a6ea7a18611593"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="a4b163245579a8b8ada0c3cb9a0467c9"/></dir><dir name="order"><file name="downloadable.phtml" hash="ba3a8f8d556f04bc11c020fc8091b79a"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="c1dcfc6fbc36f1eab61ce9d7405dc2ae"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="98a664cceab14cac8e360e62db17ebe8"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="a635b5da479db207f4684e11b57d60c6"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="b47aec2b2a04f851e011861858f666d6"/></dir><dir name="invoice"><file name="items.phtml" hash="9df2db8a77da02023105df3537c88fda"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="1e73458a24d00011b95437f1156a6b7c"/></dir><dir name="invoice"><file name="default.phtml" hash="1e73458a24d00011b95437f1156a6b7c"/></dir><dir name="order"><file name="default.phtml" hash="f85834b8b0d6a9144ab5c62494a4c518"/></dir><dir name="shipment"><file name="default.phtml" hash="9fb9140adb3fd720c9ee824646fd81ef"/></dir></dir><file name="items.phtml" hash="82514c6dd6cf89a9fe4dcc5915f8a0f8"/><dir name="shipment"><file name="items.phtml" hash="790ac5faaec91f570504804048e19be0"/><file name="track.phtml" hash="092417894365f0bd0dd1de8f5418bf75"/></dir></dir><dir name="productalert"><file name="price.phtml" hash="91075a78d49b9820b5b6b908cf3389d0"/><file name="stock.phtml" hash="be6270e6cf28569e03e0ed4cb48aa855"/></dir></dir><dir name="giftmessage"><file name="inline.phtml" hash="64693c0a3e708784446c58bdf3fd2bad"/></dir><dir name="googleanalytics"><file name="ga.phtml" hash="c3f24c1411dd96ec0cb6da8cd4e5b54d"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="b6d89597fe6ab55f24f1db71928659ca"/></dir><dir name="oauth"><dir name="authorize"><file name="button-simple.phtml" hash="b4106ed8604d849314aecdea831ca6fa"/><file name="button.phtml" hash="ab630b4316878e341c0611cfa51650aa"/><file name="confirm-simple.phtml" hash="80423693a0a07b13a9dbc5507fe74847"/><file name="confirm.phtml" hash="563d76e574a1a6c43945479c63ae711e"/><dir name="form"><file name="login-simple.phtml" hash="7b80dd4355187f7fbbfcfd6c05e8ae41"/><file name="login.phtml" hash="98743d533dea9a5dca05f3474bd6dc3c"/></dir><file name="head-simple.phtml" hash="bfd2884d2c8af4315dd919ced20235cc"/><file name="reject-simple.phtml" hash="b5b7d2623b16e56ddc95fef5a5e7a2ac"/><file name="reject.phtml" hash="51593eb4eba331894dffb67c4ca2bce2"/></dir><dir name="customer"><dir name="token"><file name="list.phtml" hash="0ed2ae29b0489f2dec0a6af03010fff5"/></dir></dir></dir><dir name="page"><file name="1column.phtml" hash="30a3accf37a4a1b3a0ef67e01798285f"/><file name="2columns-left.phtml" hash="a9cd09362fe70dcd1e8ad9680bfb470d"/><file name="2columns-right.phtml" hash="942f73ea67cd076605e464bd7c222653"/><file name="3columns.phtml" hash="b2b4e5811a0c40dc48d7515eaf5614d0"/><file name="empty.phtml" hash="11d6841d6dfa2ad0c366fb11c26068af"/><dir name="html"><file name="breadcrumbs.phtml" hash="c034a339ee600b805c6271c83225944a"/><file name="cookienotice.phtml" hash="1645713573d5f7ff72a8ff02c5ead645"/><file name="footer.phtml" hash="4561fac2fb6e8c722a3f5be2825de65b"/><file name="head.phtml" hash="8414479731562425a7dc6641486e74c5"/><file name="header.phtml" hash="8dcf15fb7a3ef937b0ffeb2efcb7b4f3"/><file name="notices.phtml" hash="7cdfff611975198bd709cabf68f76a72"/><file name="pager.phtml" hash="46cf49b484921cdacc6284bd8d1ff048"/><file name="top.links.phtml" hash="c5c2f18a6e5184206a2150dc58c01d04"/><file name="topmenu.phtml" hash="c7393f747b618c4668d5b5f39157232a"/><file name="wrapper.phtml" hash="99122df71779b8bf5146a6b0c40593d5"/></dir><dir name="js"><file name="calendar.phtml" hash="9461fd7deda2495b743ce17d405ecb28"/><file name="cookie.phtml" hash="ad57ca0a6409b2ce90448ae7c548e83f"/></dir><file name="popup.phtml" hash="97e855dcb940403ba9d3bcd64aa548de"/><file name="print.phtml" hash="e64d12aab7f325867fbaa303b8517307"/><file name="redirect.phtml" hash="8c3df16330cc29e52af3e13f32362e0c"/><dir name="switch"><file name="flags.phtml" hash="3d6dc469f573506ff0ed3b7258b23dbc"/><file name="languages.phtml" hash="f6c946bedc1e648efd462a8d7c029df4"/><file name="stores.phtml" hash="8d267ab0070362e52e37e5673bddf2c2"/></dir><dir name="template"><file name="container.phtml" hash="78db3f910f9f854d543cc803d72ca46c"/><file name="links.phtml" hash="1d4ec456ca6dbdc096e83ac2301f6fa5"/><file name="linksblock.phtml" hash="162aa23949d5aafa5b97ee383a59a102"/></dir></dir><dir name="pagecache"><file name="cookie.phtml" hash="5da6fe493e3e79ccd5a2fd8d9bd85f0f"/></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="a09ab0c7cd31ed6ee0baedb13dbae9ac"/></dir><dir name="info"><file name="cc.phtml" hash="c8e65d6b2aa010bbe9b204ab107f6157"/></dir></dir><dir name="payment"><dir name="catalog"><dir name="product"><dir name="view"><dir name="profile"><file name="options.phtml" hash="8fc392586cb4c66764382ffbc20a9393"/><file name="schedule.phtml" hash="fd48d09a03580f4a4f2f98f86de8b54a"/></dir></dir></dir></dir><dir name="form"><file name="banktransfer.phtml" hash="01644d6cf993bc5cfe2632e5a5bfdcc2"/><file name="cashondelivery.phtml" hash="9e55096120edfec835e07482bc483096"/><file name="cc.phtml" hash="23ec898742ca57a628437f21bd6101ea"/><file name="ccsave.phtml" hash="b52e20c18cf71c8200e46193cb51e58f"/><file name="checkmo.phtml" hash="9e0b5fe468c281f82f4ec1351f084e02"/><file name="purchaseorder.phtml" hash="ff79af2ed766da3a9e412b4b438b0377"/></dir><dir name="info"><file name="banktransfer.phtml" hash="e2403ade862ab927944c0d67982bed40"/><file name="checkmo.phtml" hash="df97b19db1e1c0bfc991f3d230bf00a2"/><file name="default.phtml" hash="41c1d133402c8274dd78bad60a89fbc8"/><file name="purchaseorder.phtml" hash="11574613b69778e02e20a7b1767512c4"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="address.phtml" hash="0ceee8f979be1d6a44ed6919af122016"/><file name="details.phtml" hash="d9cfdaa646d2d6693002bf6f00064201"/><dir name="shipping"><file name="method.phtml" hash="f71cbdfc5a8fe543eb03c8475a1818d3"/></dir></dir><file name="review.phtml" hash="0ee4d1c4e2055ca9050ef964b4ac0a94"/><file name="shortcut.phtml" hash="227924ef1ed156953734d44c0a0cfda0"/></dir><dir name="hss"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="700aa309bc3e2cb15fc5969204df470d"/><file name="info.phtml" hash="6ae7f528f71dc914365a9c638b61520d"/><file name="js.phtml" hash="4e57e37572a7c69e1e6c8e479a6950c1"/><file name="redirect.phtml" hash="c89c02eae033723d9fd5f8a8db70f80a"/><dir name="review"><file name="button.phtml" hash="359132746414e4ae696ba6047e2d3e98"/></dir></dir><dir name="partner"><file name="logo.phtml" hash="831fa2f4041657c5c2f3eb4acf14f788"/></dir><dir name="payflowadvanced"><file name="form.phtml" hash="991804f0ad7a6871df9bed2529746c8a"/><file name="iframe.phtml" hash="f72cbcfa9e63a56ab8b78a0e4a403706"/><file name="info.phtml" hash="4bb273041a60c52e5428b453598886c2"/><file name="redirect.phtml" hash="6c2037bdfd6603e1cd9b911da70e75dd"/></dir><dir name="payflowlink"><file name="form.phtml" hash="f25fda88eae3556b410e4c86e3754785"/><file name="iframe.phtml" hash="98df72e2f3a9bdc44c97d28bf02eef29"/><file name="info.phtml" hash="d2a18e1bfc3d3716f060962c198ec61a"/><file name="redirect.phtml" hash="e756182507ca509d1e2a396cf38ba639"/></dir><dir name="payment"><file name="mark.phtml" hash="0442986e7a40f3c2b9e7861edd206b3e"/><file name="redirect.phtml" hash="7de0a6668e72671ab6d10d08fc8e0070"/></dir></dir><dir name="paypaluk"><dir name="express"><file name="review.phtml" hash="7510838614cdbd9e15e0d26b958427c8"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="billing.phtml" hash="fc58c50dba0ecbd0c3caac7eeb43fbff"/><file name="login.phtml" hash="e0ddf3efd60b074dcf1ee758f6113a56"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="9eaacbbca591bc0977394535ccf17cd4"/><file name="register.phtml" hash="ed544c1d7e80463bd8d03cfb8b3a934e"/></dir></dir><file name="remember_me.phtml" hash="3c2c3fd5313a71d4503b5bdd70cd9ff5"/><file name="remember_me_tooltip.phtml" hash="da09485dab530b5ebce8235e655329ec"/></dir><dir name="poll"><file name="active.phtml" hash="28ba7a63284f6b6fcc4c5be76e46e238"/><file name="result.phtml" hash="215fc6adbc8c4bb647723021576b3545"/></dir><dir name="productalert"><file name="price.phtml" hash="48125dd56110e5168a1693e5fba801c5"/><dir name="product"><file name="view.phtml" hash="7d502c7725566089a9ec824783cb4ace"/></dir><file name="stock.phtml" hash="48125dd56110e5168a1693e5fba801c5"/></dir><dir name="rating"><file name="detailed.phtml" hash="fd0413a654744d23ce6eea412221a2e4"/><file name="empty.phtml" hash="2b5189dccbaa36740993f45bd6f11214"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="3246ad747921cf31aece83e6ce55f759"/><file name="home_product_viewed.phtml" hash="a284ecdbfc6964004b0e4658620ae2dd"/><file name="product_compared.phtml" hash="afc280da1526d6f2badb14671b5997db"/><file name="product_viewed.phtml" hash="865b89ca10602feaefca198b309b8d88"/><dir name="widget"><dir name="compared"><dir name="column"><file name="compared_default_list.phtml" hash="bd898d390260c74fa678b4b24c2e86a6"/><file name="compared_images_list.phtml" hash="1d109a4aa32b86a7e5569657c950fcd4"/><file name="compared_names_list.phtml" hash="d403f06d34f8bfda35fbbfec6a3dff13"/></dir><dir name="content"><file name="compared_grid.phtml" hash="e6b8367c27c67df49196836bd225d086"/><file name="compared_list.phtml" hash="822896f074525b39ab7eb6cfd392c16f"/></dir></dir><dir name="viewed"><dir name="column"><file name="viewed_default_list.phtml" hash="27b595aa16fabb2972a20f8b1e5743c5"/><file name="viewed_images_list.phtml" hash="af17684fe97e1ca6240d6e8320994aba"/><file name="viewed_names_list.phtml" hash="e27a188a161cfb6a6774545274c0698e"/></dir><dir name="content"><file name="viewed_grid.phtml" hash="762882c24518862005f76bcb1eb31e01"/><file name="viewed_list.phtml" hash="6946d8b2c6bf6acbe5fa726270bc12e4"/></dir></dir></dir></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="aa6b0ddc97f52f74d7309c508758c1a6"/><file name="recent.phtml" hash="db2da0952d12c186927fa0e5de73ef92"/><file name="view.phtml" hash="f829a98a214c59676589063ef427aadf"/></dir><file name="form.phtml" hash="6c718898d0f1dab60737dd1bb367384d"/><dir name="helper"><file name="summary.phtml" hash="7c15b7078c848df9d2346ccd1d13cad5"/><file name="summary_short.phtml" hash="3235ad0cf2262197433a415c30fcadc2"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="4330b226b0de0c1e151ea0e8cfc60bec"/><file name="list.phtml" hash="c45ef4b227ce16adeac9a66cc41b236e"/><file name="other.phtml" hash="0f7a97276b6b495e1b3dedf488018625"/></dir></dir><file name="view.phtml" hash="0aeb91cca40ccadffc2cde36918af5d6"/></dir><dir name="rss"><file name="list.phtml" hash="639a0c032698bdf5078cfa3110f0919d"/><file name="nofeed.phtml" hash="6f6fc72b022ef05a3799070ba3677aeb"/><dir name="order"><file name="details.phtml" hash="2861b91f790d93c3fbe8981e2802adc9"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="15901f66f3d2cb13cc6cb48eb3878ca7"/></dir><file name="agreements.phtml" hash="4f3fbdec473f49180470e036042a19cd"/></dir><dir name="guest"><file name="form.phtml" hash="96cd89fe53104f88439d6825ec8196a9"/></dir><dir name="order"><file name="comments.phtml" hash="77f3e95650ad0f6a90f4cb6d163b6349"/><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="697a55ee5acedb72c20139ada253fb43"/></dir></dir><file name="items.phtml" hash="986605cb8f6d86ecadb1bba6eef911ef"/></dir><file name="creditmemo.phtml" hash="dc24a51ef84241ec9a35b556311e70b7"/><file name="details.phtml" hash="7c34b1bff0d8de0276818dacc1b66d5f"/><file name="history.phtml" hash="3f3a7a713ce72e2e4060a70ee0c7c426"/><dir name="info"><file name="buttons.phtml" hash="cbb5bdeb8d78eb95b699b8c92b7404a0"/></dir><file name="info.phtml" hash="333fe60a5570c41928186065ef71b42c"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="fdcac8aa9de175930303406058dde224"/></dir></dir><file name="items.phtml" hash="229ff219a495ae5ef2e56d8ce3b5d1f9"/></dir><file name="invoice.phtml" hash="373113354854d0ef46e044ff30254b5d"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="adde3dcbf2d7853607fa59725eda8fb6"/></dir></dir><file name="items.phtml" hash="94914e5aef876233b3f42f37e20d044c"/><dir name="print"><file name="creditmemo.phtml" hash="533dfad8bc9e4b8a93306bab2c91b53f"/><file name="invoice.phtml" hash="0a5dbf9447b2d78f2c73ca5941053cb8"/><file name="shipment.phtml" hash="679c12ad01f721514926cdf476d4567d"/></dir><file name="print.phtml" hash="8cd264b3b7a9adee78385a059d1b402b"/><file name="recent.phtml" hash="60e7a7e36a960f6a8380042a1880dacd"/><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="f6edf268e181e3213120d50a617ce56e"/></dir></dir><file name="items.phtml" hash="46e6bcda7059d1de070723b362e3ee2c"/></dir><file name="shipment.phtml" hash="91d67ce7e9014e7ac3414561dbe1a776"/><file name="totals.phtml" hash="3c18ba1dc8367621c8edca23b7bc7adf"/><file name="trackinginfo.phtml" hash="0132a39a5c29091406ac6e2ff5823ae3"/><file name="view.phtml" hash="514ca6354adfffc674a45863de4267b1"/></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="55e695e1f2a2e2a0a304be27c3feda0a"/></dir></dir></dir><dir name="recurring"><file name="grid.phtml" hash="5dd2a80bdc5b6f821d92c05395a15ff6"/><dir name="profile"><dir name="view"><file name="info.phtml" hash="5b6aa541b1a9f7c71ec0bbc4490264cc"/></dir><file name="view.phtml" hash="61f0a32de037e052e9d9cfe9d1c26371"/></dir><file name="profiles.phtml" hash="e1dbb7ff1be0313200119a133ca3b6ca"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="b598ad2c6dd06ce9fdd85bd0edc3e43c"/></dir><dir name="widget"><dir name="guest"><file name="form.phtml" hash="4bd5afecd985f239e9b5e4a34d3f9083"/></dir></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="7babde26ad2c6cce943d37da7a2d0b66"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="64ef10c5b304a1dc4ecb81ab7cab8f17"/><file name="popup.phtml" hash="f60fed812f2b7583cf523a9b9771134a"/></dir></dir><dir name="tag"><file name="cloud.phtml" hash="71b12c0baf6c2051e1352c8728decd1d"/><dir name="customer"><file name="recent.phtml" hash="06c5c4ea55dd8c4fdc21c084d2f4fc15"/><file name="tags.phtml" hash="1f9189426b1f55843aa6d7626a436661"/><file name="view.phtml" hash="f69f606ae1b530c8621d129570ff3f1a"/></dir><file name="list.phtml" hash="bdc85e7907f29b7d882629b1f1fe9c4a"/><file name="popular.phtml" hash="5acb50261292e223a1c2c2315c280e29"/></dir><dir name="tax"><dir name="checkout"><file name="discount.phtml" hash="c3232e4e0e91d1e3d58fd5ccb0286d15"/><file name="grandtotal.phtml" hash="eb53b2a888da032176e3500feab7dac3"/><file name="shipping.phtml" hash="1a65fd85d96b84ec1f68930c53194fc6"/><file name="subtotal.phtml" hash="10c31870d3d53b269e431360e0e91963"/><file name="tax.phtml" hash="b2e0cbdd1eee49d85e507f52d372e67c"/></dir><dir name="order"><file name="tax.phtml" hash="c551e5681ccc3d95d37640f91431362d"/></dir></dir><dir name="wishlist"><dir name="button"><file name="share.phtml" hash="46fd019f2f64613834bc27588e6e0983"/><file name="tocart.phtml" hash="4b53bf90afa812a4ba1a31518cc174ee"/><file name="update.phtml" hash="b6d940e368b875082132220e8257e4c9"/></dir><dir name="email"><file name="items.phtml" hash="80006df1da4246533f72982231cbdced"/><file name="rss.phtml" hash="edfe5c16de2121d0526837966cda3da9"/></dir><dir name="item"><dir name="column"><file name="cart.phtml" hash="1f858cc0b01637cdc912a37ec72c2d77"/><file name="image.phtml" hash="db17bcd781abcd6d5ed353a71088105e"/><file name="info.phtml" hash="97c60f354ce7cfb3a1b5160673ae1e9b"/><file name="remove.phtml" hash="e6b9ea47c1fb9a1ed703e767fa62376f"/></dir><dir name="configure"><file name="addto.phtml" hash="2785e846cfc4f3f2ac670c6e7b75d4e7"/></dir><file name="list.phtml" hash="826c654a2414a4961f9e08e72e232fdc"/></dir><file name="options_list.phtml" hash="82edb5ed56d3bd797056aa7a2e07ff28"/><dir name="render"><dir name="item"><file name="price.phtml" hash="f47600f3dba84c055840a9ae2ea1934e"/><file name="price_msrp_item.phtml" hash="7a3c31fbf52d1f74b7ffb9ca25f79cb4"/><file name="price_msrp_rss.phtml" hash="288d268cce8b3c8a055ba19d5270f4e8"/></dir></dir><file name="shared.phtml" hash="07be81c4eb489e6c178b1659039a6de6"/><file name="sharing.phtml" hash="ac8d3b2f1752a7c6aa279faf96022363"/><file name="sidebar.phtml" hash="4fb9cfd8a5dddd98141374d9b1a04478"/><file name="view.phtml" hash="45c4f13743b38d7ccf3f93fac915a1a6"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><file name="widgets.css" hash="4732f4eb6427aff580ed48ed524c9ccd"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="calendar.gif" hash="b1468e5239504974c689eea5d93f86d4"/><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="cookies"><file name="firefox.png" hash="425e1b2ddc38c0bba431fb54357c66a4"/><file name="ie6-1.gif" hash="5c27700e245762bc89ed8c3ee7183f21"/><file name="ie6-2.gif" hash="d8c55e15e1f711e5c259300a9c19551b"/><file name="ie7-1.gif" hash="d61edcc8a514a3c81ea116b7d38ddcb6"/><file name="ie7-2.gif" hash="0526a654e94c54866cad977c0a47d3e5"/><file name="ie7-3.gif" hash="4fb142def3f6cfd8d8d23e1315528a1e"/><file name="ie7-4.gif" hash="575c276231c6a91e28935ec98215e146"/><file name="ie7-5.gif" hash="3ae5fcc11fe89da91674d183872337c1"/><file name="ie7-6.gif" hash="95a4981a41785a8cde273c9b2edbfbc7"/><file name="opera.png" hash="34070d92180d4ee0e37b1dd8bb731cd7"/></dir><file name="cvv.gif" hash="83cdd38bf110b0f9c52fe84b56f45298"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><dir name="widgets"><file name="i_block-list.gif" hash="fe8424127ecbe4b0d893bcf6f253dc1a"/><file name="i_widget-link.gif" hash="1bf753578171f147f0203e7b13bdd0c4"/><file name="i_widget-new.gif" hash="a75377ffed51b711cbc608ffaa1a2e7d"/></dir></dir><dir name="js"><file name="bundle.js" hash="248f8461a64a9e537cb8c7018b74c938"/><dir name="checkout"><file name="review.js" hash="689b8d6d30484eaca413d5303360ec81"/></dir><file name="giftmessage.js" hash="6e0d23b1b4c0f0a59abec709eb6b5dc4"/><file name="ie6.js" hash="46173fb9f7c45fd107ba4df4df397ffb"/><file name="msrp.js" hash="c22fa5f0f4bb239bfa44276fe674be72"/><file name="opcheckout.js" hash="c39c87c8f78abf7d0ab7fad3726de7d6"/></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="25386a0f30a2a185e728251733431f96"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.1.0</min><max>1.9.0.0</max></package></required></dependencies>
18
  </package>
skin/frontend/base/default/js/bundle.js CHANGED
@@ -89,6 +89,7 @@ Product.Bundle.prototype = {
89
  var calculatedPrice = 0;
90
  var dispositionPrice = 0;
91
  var includeTaxPrice = 0;
 
92
  for (var option in this.config.selected) {
93
  if (this.config.options[option]) {
94
  for (var i=0; i < this.config.selected[option].length; i++) {
@@ -100,6 +101,27 @@ Product.Bundle.prototype = {
100
  }
101
  }
102
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
103
  var event = $(document).fire('bundle:reload-price', {
104
  price: calculatedPrice,
105
  priceInclTax: includeTaxPrice,
@@ -159,7 +181,6 @@ Product.Bundle.prototype = {
159
 
160
  if (this.config.specialPrice) {
161
  newPrice = (price*this.config.specialPrice)/100;
162
- newPrice = (Math.round(newPrice*100)/100).toString();
163
  price = Math.min(newPrice, price);
164
  }
165
 
@@ -174,8 +195,23 @@ Product.Bundle.prototype = {
174
  priceInclTax = price;
175
  }
176
 
177
- var result = new Array(price*qty, disposition*qty, priceInclTax*qty);
178
- return result;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
179
  },
180
 
181
  populateQty: function(optionId, selectionId){
89
  var calculatedPrice = 0;
90
  var dispositionPrice = 0;
91
  var includeTaxPrice = 0;
92
+
93
  for (var option in this.config.selected) {
94
  if (this.config.options[option]) {
95
  for (var i=0; i < this.config.selected[option].length; i++) {
101
  }
102
  }
103
 
104
+ //Tax is calculated in a different way for the the TOTAL BASED method
105
+ //We round the taxes at the end. Hence we do the same for consistency
106
+ //This variable is set in the bundle.phtml
107
+ if (taxCalcMethod == CACL_TOTAL_BASE) {
108
+ var calculatedPriceFormatted = calculatedPrice.toFixed(10);
109
+ var includeTaxPriceFormatted = includeTaxPrice.toFixed(10);
110
+ var tax = includeTaxPriceFormatted - calculatedPriceFormatted;
111
+ calculatedPrice = includeTaxPrice - Math.round(tax * 100) / 100;
112
+ }
113
+
114
+ //make sure that the prices are all rounded to two digits
115
+ //this is needed when tax calculation is based on total for dynamic
116
+ //price bundle product. For fixed price bundle product, the rounding
117
+ //needs to be done after option price is added to base price
118
+ if (this.config.priceType == '0') {
119
+ calculatedPrice = Math.round(calculatedPrice*100)/100;
120
+ dispositionPrice = Math.round(dispositionPrice*100)/100;
121
+ includeTaxPrice = Math.round(includeTaxPrice*100)/100;
122
+
123
+ }
124
+
125
  var event = $(document).fire('bundle:reload-price', {
126
  price: calculatedPrice,
127
  priceInclTax: includeTaxPrice,
181
 
182
  if (this.config.specialPrice) {
183
  newPrice = (price*this.config.specialPrice)/100;
 
184
  price = Math.min(newPrice, price);
185
  }
186
 
195
  priceInclTax = price;
196
  }
197
 
198
+ if (this.config.priceType == '1' || taxCalcMethod == CACL_TOTAL_BASE) {
199
+ var result = new Array(price*qty, disposition*qty, priceInclTax*qty);
200
+ return result;
201
+ }
202
+ else if (taxCalcMethod == CACL_UNIT_BASE) {
203
+ price = (Math.round(price*100)/100).toString();
204
+ disposition = (Math.round(disposition*100)/100).toString();
205
+ priceInclTax = (Math.round(priceInclTax*100)/100).toString();
206
+ var result = new Array(price*qty, disposition*qty, priceInclTax*qty);
207
+ return result;
208
+ } else { //taxCalcMethod == CACL_ROW_BASE)
209
+ price = (Math.round(price*qty*100)/100).toString();
210
+ disposition = (Math.round(disposition*qty*100)/100).toString();
211
+ priceInclTax = (Math.round(priceInclTax*qty*100)/100).toString();
212
+ var result = new Array(price, disposition, priceInclTax);
213
+ return result;
214
+ }
215
  },
216
 
217
  populateQty: function(optionId, selectionId){