Interface_Frontend_Blank - Version 1.2.0

Version Notes

1.2.0

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_Blank
Version 1.2.0
Comparing to
See all releases


Code changes from version 1.1.8 to 1.2.0

Files changed (77) hide show
  1. app/design/frontend/blank/default/layout/catalogsearch.xml +1 -0
  2. app/design/frontend/blank/default/layout/core.xml +3 -0
  3. app/design/frontend/blank/default/layout/directory.xml +13 -0
  4. app/design/frontend/blank/default/layout/downloadable.xml +167 -0
  5. app/design/frontend/blank/default/layout/googleoptimizer.xml +153 -0
  6. app/design/frontend/blank/default/template/bundle/catalog/product/price.phtml +164 -3
  7. app/design/frontend/blank/default/template/bundle/catalog/product/view/price.phtml +39 -0
  8. app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml +1 -1
  9. app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml +1 -1
  10. app/design/frontend/blank/default/template/bundle/email/order/items/creditmemo/default.phtml +73 -6
  11. app/design/frontend/blank/default/template/bundle/email/order/items/invoice/default.phtml +73 -6
  12. app/design/frontend/blank/default/template/bundle/email/order/items/order/default.phtml +74 -7
  13. app/design/frontend/blank/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +179 -26
  14. app/design/frontend/blank/default/template/bundle/sales/order/invoice/items/renderer.phtml +227 -28
  15. app/design/frontend/blank/default/template/bundle/sales/order/items/renderer.phtml +226 -28
  16. app/design/frontend/blank/default/template/callouts/left_col.phtml +1 -1
  17. app/design/frontend/blank/default/template/callouts/right_col.phtml +1 -1
  18. app/design/frontend/blank/default/template/catalog/category/view.phtml +1 -1
  19. app/design/frontend/blank/default/template/catalog/product/list.phtml +4 -4
  20. app/design/frontend/blank/default/template/catalog/product/price.phtml +239 -25
  21. app/design/frontend/blank/default/template/catalog/product/view/media.phtml +2 -2
  22. app/design/frontend/blank/default/template/catalog/product/view/tierprices.phtml +138 -7
  23. app/design/frontend/blank/default/template/catalogsearch/advanced/form.phtml +1 -1
  24. app/design/frontend/blank/default/template/checkout/cart/item/default.phtml +172 -6
  25. app/design/frontend/blank/default/template/checkout/cart/sidebar/default.phtml +78 -6
  26. app/design/frontend/blank/default/template/checkout/multishipping/billing.phtml +1 -1
  27. app/design/frontend/blank/default/template/checkout/multishipping/overview.phtml +4 -4
  28. app/design/frontend/blank/default/template/checkout/multishipping/shipping.phtml +1 -1
  29. app/design/frontend/blank/default/template/checkout/multishipping/success.phtml +1 -0
  30. app/design/frontend/blank/default/template/checkout/onepage/billing.phtml +1 -1
  31. app/design/frontend/blank/default/template/checkout/onepage/progress.phtml +4 -4
  32. app/design/frontend/blank/default/template/checkout/onepage/review/item.phtml +178 -4
  33. app/design/frontend/blank/default/template/checkout/success.phtml +4 -1
  34. app/design/frontend/blank/default/template/checkout/total/tax.phtml +8 -3
  35. app/design/frontend/blank/default/template/contacts/form.phtml +2 -2
  36. app/design/frontend/blank/default/template/core/formkey.phtml +27 -0
  37. app/design/frontend/blank/default/template/customer/address/edit.phtml +3 -2
  38. app/design/frontend/blank/default/template/customer/form/address.phtml +2 -2
  39. app/design/frontend/blank/default/template/customer/form/edit.phtml +2 -1
  40. app/design/frontend/blank/default/template/customer/form/newsletter.phtml +1 -0
  41. app/design/frontend/blank/default/template/customer/form/register.phtml +3 -3
  42. app/design/frontend/blank/default/template/customer/widget/dob.phtml +3 -3
  43. app/design/frontend/blank/default/template/downloadable/catalog/product/links.phtml +111 -0
  44. app/design/frontend/blank/default/template/downloadable/catalog/product/samples.phtml +45 -0
  45. app/design/frontend/blank/default/template/downloadable/catalog/product/type.phtml +45 -0
  46. app/design/frontend/blank/default/template/downloadable/checkout/cart/item/default.phtml +103 -0
  47. app/design/frontend/blank/default/template/downloadable/checkout/multishipping/item/downloadable.phtml +57 -0
  48. app/design/frontend/blank/default/template/downloadable/checkout/onepage/review/item.phtml +72 -0
  49. app/design/frontend/blank/default/template/downloadable/checkout/success.phtml +29 -0
  50. app/design/frontend/blank/default/template/downloadable/customer/products/list.phtml +62 -0
  51. app/design/frontend/blank/default/template/downloadable/email/order/items/creditmemo/downloadable.phtml +128 -0
  52. app/design/frontend/blank/default/template/downloadable/email/order/items/invoice/downloadable.phtml +131 -0
  53. app/design/frontend/blank/default/template/downloadable/email/order/items/order/downloadable.phtml +137 -0
  54. app/design/frontend/blank/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +113 -0
  55. app/design/frontend/blank/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +110 -0
  56. app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer.phtml +130 -0
  57. app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +132 -0
  58. app/design/frontend/blank/default/template/email/order/items/creditmemo/default.phtml +74 -7
  59. app/design/frontend/blank/default/template/email/order/items/invoice/default.phtml +74 -7
  60. app/design/frontend/blank/default/template/email/order/items/order/default.phtml +74 -7
  61. app/design/frontend/blank/default/template/googlecheckout/link.phtml +5 -1
  62. app/design/frontend/blank/default/template/page/html/head.phtml +1 -0
  63. app/design/frontend/blank/default/template/paypal/express/review.phtml +5 -5
  64. app/design/frontend/blank/default/template/paypal/express/review/details.phtml +12 -12
  65. app/design/frontend/blank/default/template/sales/order/creditmemo/items/renderer/default.phtml +207 -9
  66. app/design/frontend/blank/default/template/sales/order/invoice/items/renderer/default.phtml +206 -8
  67. app/design/frontend/blank/default/template/sales/order/items/renderer/default.phtml +206 -8
  68. app/design/frontend/blank/default/template/sales/order/print/tax.phtml +8 -2
  69. app/design/frontend/blank/default/template/sales/order/tax.phtml +7 -2
  70. app/design/frontend/blank/default/template/shipping/tracking/popup.phtml +1 -1
  71. app/design/frontend/blank/default/template/tag/customer/edit.phtml +1 -1
  72. app/design/frontend/blank/default/template/tag/list.phtml +1 -1
  73. app/design/frontend/blank/default/template/wishlist/sharing.phtml +4 -3
  74. app/design/frontend/blank/default/template/wishlist/view.phtml +1 -0
  75. package.xml +6 -6
  76. skin/frontend/blank/default/css/styles.css +14 -15
  77. skin/frontend/blank/default/js/bundle.js +21 -4
app/design/frontend/blank/default/layout/catalogsearch.xml CHANGED
@@ -45,6 +45,7 @@
45
<action method="setTemplate"><template>page/3columns.phtml</template></action>
46
</reference>
47
<reference name="left">
48
<block type="newsletter/subscribe" name="left.newsletter" template="newsletter/subscribe.phtml"/>
49
</reference>
50
<reference name="content">
45
<action method="setTemplate"><template>page/3columns.phtml</template></action>
46
</reference>
47
<reference name="left">
48
+ <block type="catalogsearch/layer" name="catalogsearch.leftnav" after="currency" template="catalog/layer/view.phtml"/>
49
<block type="newsletter/subscribe" name="left.newsletter" template="newsletter/subscribe.phtml"/>
50
</reference>
51
<reference name="content">
app/design/frontend/blank/default/layout/core.xml CHANGED
@@ -27,4 +27,7 @@
27
28
-->
29
<layout version="0.1.0">
30
</layout>
27
28
-->
29
<layout version="0.1.0">
30
+ <default>
31
+ <block name="formkey" type="core/template" template="core/formkey.phtml" />
32
+ </default>
33
</layout>
app/design/frontend/blank/default/layout/directory.xml CHANGED
@@ -57,4 +57,17 @@ Catalog Search layout
57
<block type="directory/currency" name="right_currency" before="-" template="directory/currency.phtml"/>
58
</reference>
59
</catalogsearch_advanced_index>
60
</layout>
57
<block type="directory/currency" name="right_currency" before="-" template="directory/currency.phtml"/>
58
</reference>
59
</catalogsearch_advanced_index>
60
+
61
+ <catalogsearch_result_index>
62
+ <reference name="left">
63
+ <block type="directory/currency" name="currency" before="-" template="directory/currency.phtml"/>
64
+ </reference>
65
+ </catalogsearch_result_index>
66
+
67
+ <catalogsearch_advanced_result>
68
+ <reference name="right">
69
+ <block type="directory/currency" name="right_currency" before="-" template="directory/currency.phtml"/>
70
+ </reference>
71
+ </catalogsearch_advanced_result>
72
+
73
</layout>
app/design/frontend/blank/default/layout/downloadable.xml ADDED
@@ -0,0 +1,167 @@
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_default
23
+ * @package Mage_Downloadable
24
+ * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.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
+ <customer_account>
32
+ <reference name="customer_account_navigation">
33
+ <action method="addLink" translate="label" module="downloadable"><name>downloadable_products</name><path>downloadable/customer/products</path><label>My Downloadable Products</label></action>
34
+ </reference>
35
+ </customer_account>
36
+
37
+ <downloadable_customer_products>
38
+ <update handle="customer_account"/>
39
+ <reference name="content">
40
+ <block type="downloadable/customer_products_list" name="downloadable_customer_products_list" template="downloadable/customer/products/list.phtml" />
41
+ </reference>
42
+ <reference name="root">
43
+ <action method="setHeaderTitle" translate="title" module="downloadable"><title>My Downloadable Products</title></action>
44
+ </reference>
45
+ </downloadable_customer_products>
46
+
47
+ <checkout_cart_index>
48
+ <reference name="checkout.cart">
49
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/cart/item/default.phtml</template></action>
50
+ </reference>
51
+ </checkout_cart_index>
52
+
53
+ <checkout_onepage_review>
54
+ <reference name="root">
55
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/onepage/review/item.phtml</template></action>
56
+ </reference>
57
+ </checkout_onepage_review>
58
+
59
+ <checkout_onepage_success>
60
+ <reference name="checkout.success">
61
+ <block type="downloadable/checkout_success" name="downloadable.checkout.success" template="downloadable/checkout/success.phtml"/>
62
+ </reference>
63
+ </checkout_onepage_success>
64
+
65
+ <checkout_multishipping_addresses>
66
+ <reference name="checkout_addresses">
67
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/multishipping/item/downloadable.phtml</template></action>
68
+ </reference>
69
+ </checkout_multishipping_addresses>
70
+
71
+ <checkout_multishipping_shipping>
72
+ <reference name="checkout_billing_items">
73
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/multishipping/item/downloadable.phtml</template></action>
74
+ </reference>
75
+ </checkout_multishipping_shipping>
76
+
77
+ <checkout_multishipping_overview>
78
+ <reference name="checkout_overview">
79
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>downloadable/checkout/multishipping/item/downloadable.phtml</template></action>
80
+ </reference>
81
+ </checkout_multishipping_overview>
82
+
83
+ <checkout_multishipping_success>
84
+ <reference name="checkout_success">
85
+ <block type="downloadable/checkout_success" name="downloadable.checkout.success" template="downloadable/checkout/success.phtml"/>
86
+ </reference>
87
+ </checkout_multishipping_success>
88
+
89
+ <sales_order_view>
90
+ <reference name="order_items">
91
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/items/renderer/downloadable.phtml</template></action>
92
+ </reference>
93
+ </sales_order_view>
94
+
95
+ <sales_order_invoice>
96
+ <reference name="invoice_items">
97
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/invoice/items/renderer/downloadable.phtml</template></action>
98
+ </reference>
99
+ </sales_order_invoice>
100
+
101
+ <sales_order_creditmemo>
102
+ <reference name="creditmemo_items">
103
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml</template></action>
104
+ </reference>
105
+ </sales_order_creditmemo>
106
+
107
+ <!--
108
+ Print pages
109
+ -->
110
+
111
+ <sales_order_print>
112
+ <reference name="sales.order.print">
113
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/items/renderer/downloadable.phtml</template></action>
114
+ </reference>
115
+ </sales_order_print>
116
+
117
+ <sales_order_printinvoice>
118
+ <reference name="sales.order.print.invoice">
119
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/invoice/items/renderer/downloadable.phtml</template></action>
120
+ </reference>
121
+ </sales_order_printinvoice>
122
+
123
+ <sales_order_printcreditmemo>
124
+ <reference name="sales.order.print.creditmemo">
125
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_item_renderer_downloadable</block><template>downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml</template></action>
126
+ </reference>
127
+ </sales_order_printcreditmemo>
128
+
129
+ <!--
130
+ EOF Print pages
131
+ -->
132
+
133
+ <!--
134
+ Emails
135
+ -->
136
+
137
+ <sales_email_order_items>
138
+ <reference name="items">
139
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_email_items_order_downloadable</block><template>downloadable/email/order/items/order/downloadable.phtml</template></action>
140
+ </reference>
141
+ </sales_email_order_items>
142
+
143
+ <sales_email_order_invoice_items>
144
+ <reference name="items">
145
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_email_items_downloadable</block><template>downloadable/email/order/items/invoice/downloadable.phtml</template></action>
146
+ </reference>
147
+ </sales_email_order_invoice_items>
148
+
149
+ <sales_email_order_creditmemo_items>
150
+ <reference name="items">
151
+ <action method="addItemRender"><type>downloadable</type><block>downloadable/sales_order_email_items_downloadable</block><template>downloadable/email/order/items/creditmemo/downloadable.phtml</template></action>
152
+ </reference>
153
+ </sales_email_order_creditmemo_items>
154
+
155
+ <PRODUCT_TYPE_downloadable>
156
+ <reference name="product.info">
157
+ <block type="downloadable/catalog_product_view_type" name="product.info.downloadable" as="product_type_data" template="downloadable/catalog/product/type.phtml">
158
+ <block type="downloadable/catalog_product_samples" name="product.info.downloadable.samples" as="samples" template="downloadable/catalog/product/samples.phtml"/>
159
+ </block>
160
+ </reference>
161
+ <reference name="product.info.options.wrapper">
162
+ <block type="downloadable/catalog_product_links" name="product.info.downloadable.options" as="type_downloadable_options" before="-" template="downloadable/catalog/product/links.phtml"/>
163
+ <action method="insert"><block>product.info.downloadable.options</block></action>
164
+ </reference>
165
+ </PRODUCT_TYPE_downloadable>
166
+
167
+ </layout>
app/design/frontend/blank/default/layout/googleoptimizer.xml ADDED
@@ -0,0 +1,153 @@
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_default
23
+ * @package Mage
24
+ * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
25
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
+ */
27
+ -->
28
+ <layout version="0.1.0">
29
+
30
+ <!--
31
+ Product view
32
+ -->
33
+
34
+ <catalog_product_view>
35
+ <reference name="head">
36
+ <block type="googleoptimizer/code_product" before="-" name="googleoptimizer.control.script">
37
+ <action method="setScriptType"><scriptType>control_script</scriptType></action>
38
+ </block>
39
+ </reference>
40
+ <reference name="before_body_end">
41
+ <block type="googleoptimizer/code_product" after="-" name="googleoptimizer.tracking.script">
42
+ <action method="setScriptType"><scriptType>tracking_script</scriptType></action>
43
+ </block>
44
+ </reference>
45
+ </catalog_product_view>
46
+
47
+ <catalog_category_default>
48
+ <reference name="head">
49
+ <block type="googleoptimizer/code_category" before="-" name="googleoptimizer.control.script">
50
+ <action method="setScriptType"><scriptType>control_script</scriptType></action>
51
+ </block>
52
+ </reference>
53
+ <reference name="before_body_end">
54
+ <block type="googleoptimizer/code_category" after="-" name="googleoptimizer.tracking.script">
55
+ <action method="setScriptType"><scriptType>tracking_script</scriptType></action>
56
+ </block>
57
+ </reference>
58
+ </catalog_category_default>
59
+
60
+ <catalog_category_layered>
61
+ <reference name="head">
62
+ <block type="googleoptimizer/code_category" before="-" name="googleoptimizer.control.script">
63
+ <action method="setScriptType"><scriptType>control_script</scriptType></action>
64
+ </block>
65
+ </reference>
66
+ <reference name="before_body_end">
67
+ <block type="googleoptimizer/code_category" after="-" name="googleoptimizer.tracking.script">
68
+ <action method="setScriptType"><scriptType>tracking_script</scriptType></action>
69
+ </block>
70
+ </reference>
71
+ </catalog_category_layered>
72
+
73
+ <cms_page>
74
+ <reference name="head">
75
+ <block type="googleoptimizer/code_page" before="-" name="googleoptimizer.control.script">
76
+ <action method="setScriptType"><scriptType>control_script</scriptType></action>
77
+ </block>
78
+ </reference>
79
+ <reference name="before_body_end">
80
+ <block type="googleoptimizer/code_page" after="-" name="googleoptimizer.tracking.script">
81
+ <action method="setScriptType"><scriptType>tracking_script</scriptType></action>
82
+ </block>
83
+ </reference>
84
+ </cms_page>
85
+
86
+ <cms_page>
87
+ <reference name="head">
88
+ <block type="googleoptimizer/code_page" before="-" name="googleoptimizer.control.script">
89
+ <action method="setScriptType"><scriptType>control_script</scriptType></action>
90
+ </block>
91
+ </reference>
92
+ <reference name="before_body_end">
93
+ <block type="googleoptimizer/code_page" after="-" name="googleoptimizer.tracking.script">
94
+ <action method="setScriptType"><scriptType>tracking_script</scriptType></action>
95
+ </block>
96
+ </reference>
97
+ </cms_page>
98
+
99
+ <checkout_cart_index>
100
+ <reference name="before_body_end">
101
+ <block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
102
+ <action method="setScriptType"><scriptType>conversion_script</scriptType></action>
103
+ <action method="setPageType"><pageType>checkout_cart</pageType></action>
104
+ </block>
105
+ </reference>
106
+ </checkout_cart_index>
107
+
108
+ <checkout_onepage_index>
109
+ <reference name="before_body_end">
110
+ <block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
111
+ <action method="setScriptType"><scriptType>conversion_script</scriptType></action>
112
+ <action method="setPageType"><pageType>checkout_onepage</pageType></action>
113
+ </block>
114
+ </reference>
115
+ </checkout_onepage_index>
116
+
117
+ <checkout_onepage_success>
118
+ <reference name="before_body_end">
119
+ <block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
120
+ <action method="setScriptType"><scriptType>conversion_script</scriptType></action>
121
+ <action method="setPageType"><pageType>checkout_onepage_success</pageType></action>
122
+ </block>
123
+ </reference>
124
+ </checkout_onepage_success>
125
+
126
+ <checkout_multishipping_success>
127
+ <reference name="before_body_end">
128
+ <block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
129
+ <action method="setScriptType"><scriptType>conversion_script</scriptType></action>
130
+ <action method="setPageType"><pageType>checkout_multishipping_success</pageType></action>
131
+ </block>
132
+ </reference>
133
+ </checkout_multishipping_success>
134
+
135
+ <checkout_multishipping>
136
+ <reference name="before_body_end">
137
+ <block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
138
+ <action method="setScriptType"><scriptType>conversion_script</scriptType></action>
139
+ <action method="setPageType"><pageType>checkout_multishipping</pageType></action>
140
+ </block>
141
+ </reference>
142
+ </checkout_multishipping>
143
+
144
+ <customer_account_create>
145
+ <reference name="before_body_end">
146
+ <block type="googleoptimizer/code_conversion" after="-" name="googleoptimizer.conversion.script">
147
+ <action method="setScriptType"><scriptType>conversion_script</scriptType></action>
148
+ <action method="setPageType"><pageType>customer_account_create</pageType></action>
149
+ </block>
150
+ </reference>
151
+ </customer_account_create>
152
+
153
+ </layout>
app/design/frontend/blank/default/template/bundle/catalog/product/price.phtml CHANGED
@@ -28,9 +28,28 @@
28
<?php list($_minimalPrice, $_maximalPrice) = $_product->getPriceModel()->getPrices($_product) ?>
29
<?php $_id = $_product->getId() ?>
30
31
<?php $_minimalPriceTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice); ?>
32
<?php $_minimalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice, true); ?>
33
34
<div class="price-box">
35
<?php if ($_product->getPriceView()): ?>
36
<p class="minimal-price">
@@ -40,15 +59,47 @@
40
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
41
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
42
</span>
43
<span class="price-including-tax">
44
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
45
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
46
</span>
47
- </p>
48
<?php else: ?>
49
- <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
50
- </p>
51
<?php endif; ?>
52
<?php else: ?>
53
<?php if ($_minimalPrice <> $_maximalPrice): ?>
54
<p class="price-from">
@@ -58,16 +109,60 @@
58
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
59
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
60
</span>
61
<span class="price-including-tax">
62
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
63
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
64
</span>
65
<?php else: ?>
66
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
67
<?php endif; ?>
68
</p>
69
<?php $_maximalPriceTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice); ?>
70
<?php $_maximalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice, true); ?>
71
<p class="price-to">
72
<span class="price-label"><?php echo $this->__('To') ?>:</span>
73
<?php if ($this->helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
@@ -75,12 +170,45 @@
75
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
76
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
77
</span>
78
<span class="price-including-tax">
79
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax') ?></span>
80
<?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
81
</span>
82
<?php else: ?>
83
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
84
<?php endif; ?>
85
</p>
86
<?php else: ?>
@@ -89,12 +217,45 @@
89
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
90
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
91
</span>
92
<span class="price-including-tax">
93
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
94
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
95
</span>
96
<?php else: ?>
97
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
98
<?php endif; ?>
99
<?php endif; ?>
100
<?php endif; ?>
28
<?php list($_minimalPrice, $_maximalPrice) = $_product->getPriceModel()->getPrices($_product) ?>
29
<?php $_id = $_product->getId() ?>
30
31
+ <?php $_weeeTaxAmount = 0; ?>
32
+
33
<?php $_minimalPriceTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice); ?>
34
<?php $_minimalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_minimalPrice, true); ?>
35
36
+ <?php
37
+ if ($_product->getPriceType() == 1) {
38
+ $_weeeTaxAmount = Mage::helper('weee')->getAmount($_product);
39
+ if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
40
+ $_minimalPriceTax += $_weeeTaxAmount;
41
+ $_minimalPriceInclTax += $_weeeTaxAmount;
42
+ }
43
+ if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
44
+ $_minimalPriceInclTax += $_weeeTaxAmount;
45
+ }
46
+
47
+ if (Mage::helper('weee')->typeOfDisplay($_product, array(1,2,4))) {
48
+ $_weeeTaxAttributes = Mage::helper('weee')->getProductWeeeAttributesForDisplay($_product);
49
+ }
50
+ }
51
+ ?>
52
+
53
<div class="price-box">
54
<?php if ($_product->getPriceView()): ?>
55
<p class="minimal-price">
59
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
60
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
61
</span>
62
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
63
+ <span class="weee">(<small>
64
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
65
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
66
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
67
+ <?php else: ?>
68
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
69
+ <?php endif; ?>
70
+
71
+ <?php echo $_weeeSeparator; ?>
72
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
73
+ <?php $_weeeSeparator = ' + '; ?>
74
+ <?php endforeach; ?>
75
+ </small>)</span>
76
+ <?php endif; ?>
77
<span class="price-including-tax">
78
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
79
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
80
</span>
81
<?php else: ?>
82
+ <?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
83
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
84
+ <span class="weee">(<small>
85
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
86
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
87
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
88
+ <?php else: ?>
89
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
90
+ <?php endif; ?>
91
+
92
+ <?php echo $_weeeSeparator; ?>
93
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
94
+ <?php $_weeeSeparator = ' + '; ?>
95
+ <?php endforeach; ?>
96
+ </small>)</span>
97
+ <?php endif; ?>
98
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
99
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
100
+ <?php endif; ?>
101
<?php endif; ?>
102
+ </p>
103
<?php else: ?>
104
<?php if ($_minimalPrice <> $_maximalPrice): ?>
105
<p class="price-from">
109
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
110
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
111
</span>
112
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
113
+ <span class="weee">(<small>
114
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
115
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
116
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
117
+ <?php else: ?>
118
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
119
+ <?php endif; ?>
120
+
121
+ <?php echo $_weeeSeparator; ?>
122
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
123
+ <?php $_weeeSeparator = ' + '; ?>
124
+ <?php endforeach; ?>
125
+ </small>)</span>
126
+ <?php endif; ?>
127
<span class="price-including-tax">
128
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
129
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
130
</span>
131
<?php else: ?>
132
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
133
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
134
+ <span class="weee">(<small>
135
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
136
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
137
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
138
+ <?php else: ?>
139
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
140
+ <?php endif; ?>
141
+
142
+ <?php echo $_weeeSeparator; ?>
143
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
144
+ <?php $_weeeSeparator = ' + '; ?>
145
+ <?php endforeach; ?>
146
+ </small>)</span>
147
+ <?php endif; ?>
148
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
149
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
150
+ <?php endif; ?>
151
<?php endif; ?>
152
</p>
153
<?php $_maximalPriceTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice); ?>
154
<?php $_maximalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_maximalPrice, true); ?>
155
+ <?php
156
+ if ($_product->getPriceType() == 1) {
157
+ if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, array(0, 1, 4))) {
158
+ $_maximalPriceTax += $_weeeTaxAmount;
159
+ $_maximalPriceInclTax += $_weeeTaxAmount;
160
+ }
161
+ if ($_weeeTaxAmount && Mage::helper('weee')->typeOfDisplay($_product, 2)) {
162
+ $_maximalPriceInclTax += $_weeeTaxAmount;
163
+ }
164
+ }
165
+ ?>
166
<p class="price-to">
167
<span class="price-label"><?php echo $this->__('To') ?>:</span>
168
<?php if ($this->helper('tax')->displayBothPrices() && $this->isRatesGraterThenZero()): ?>
170
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
171
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
172
</span>
173
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
174
+ <span class="weee">(<small>
175
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
176
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
177
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
178
+ <?php else: ?>
179
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
180
+ <?php endif; ?>
181
+
182
+ <?php echo $_weeeSeparator; ?>
183
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
184
+ <?php $_weeeSeparator = ' + '; ?>
185
+ <?php endforeach; ?>
186
+ </small>)</span>
187
+ <?php endif; ?>
188
<span class="price-including-tax">
189
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax') ?></span>
190
<?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
191
</span>
192
<?php else: ?>
193
<?php echo Mage::helper('core')->currency($_maximalPriceTax) ?>
194
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
195
+ <span class="weee">(<small>
196
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
197
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
198
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
199
+ <?php else: ?>
200
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
201
+ <?php endif; ?>
202
+
203
+ <?php echo $_weeeSeparator; ?>
204
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
205
+ <?php $_weeeSeparator = ' + '; ?>
206
+ <?php endforeach; ?>
207
+ </small>)</span>
208
+ <?php endif; ?>
209
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
210
+ <?php echo Mage::helper('core')->currency($_maximalPriceInclTax) ?>
211
+ <?php endif; ?>
212
<?php endif; ?>
213
</p>
214
<?php else: ?>
217
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
218
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
219
</span>
220
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
221
+ <span class="weee">(<small>
222
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
223
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
224
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
225
+ <?php else: ?>
226
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
227
+ <?php endif; ?>
228
+
229
+ <?php echo $_weeeSeparator; ?>
230
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
231
+ <?php $_weeeSeparator = ' + '; ?>
232
+ <?php endforeach; ?>
233
+ </small>)</span>
234
+ <?php endif; ?>
235
<span class="price-including-tax">
236
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
237
<?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
238
</span>
239
<?php else: ?>
240
<?php echo Mage::helper('core')->currency($_minimalPriceTax) ?>
241
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
242
+ <span class="weee">(<small>
243
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
244
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
245
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
246
+ <?php else: ?>
247
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
248
+ <?php endif; ?>
249
+
250
+ <?php echo $_weeeSeparator; ?>
251
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
252
+ <?php $_weeeSeparator = ' + '; ?>
253
+ <?php endforeach; ?>
254
+ </small>)</span>
255
+ <?php endif; ?>
256
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
257
+ <?php echo Mage::helper('core')->currency($_minimalPriceInclTax) ?>
258
+ <?php endif; ?>
259
<?php endif; ?>
260
<?php endif; ?>
261
<?php endif; ?>
app/design/frontend/blank/default/template/bundle/catalog/product/view/price.phtml CHANGED
@@ -27,6 +27,15 @@
27
<?php $_product = $this->getProduct() ?>
28
<?php $_finalPrice = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice()); ?>
29
<?php $_finalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice(), true); ?>
30
31
<div class="price-box">
32
<p class="price-as-configured">
@@ -37,6 +46,21 @@
37
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
38
<span class="price" id="price-excluding-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
39
</span>
40
<span class="price-including-tax">
41
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
42
<span class="price" id="price-including-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
@@ -44,6 +68,21 @@
44
</span>
45
<?php else: ?>
46
<span class="price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
47
<?php endif; ?>
48
</p>
49
</div>
27
<?php $_product = $this->getProduct() ?>
28
<?php $_finalPrice = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice()); ?>
29
<?php $_finalPriceInclTax = Mage::helper('tax')->getPrice($_product, $_product->getFinalPrice(), true); ?>
30
+ <?php $_weeeTaxAmount = 0; ?>
31
+ <?php
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
+ ?>
39
40
<div class="price-box">
41
<p class="price-as-configured">
46
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
47
<span class="price" id="price-excluding-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></span>
48
</span>
49
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && Mage::helper('weee')->typeOfDisplay($_product, array(2, 1, 4))): ?>
50
+ <span class="weee">(<small>
51
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
52
+ <?php if (Mage::helper('weee')->typeOfDisplay($_product, array(2, 4))): ?>
53
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
54
+ <?php else: ?>
55
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
56
+ <?php endif; ?>
57
+
58
+ <?php echo $_weeeSeparator; ?>
59
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo Mage::helper('core')->currency($amount, true, true); ?>
60
+ <?php $_weeeSeparator = ' + '; ?>
61
+ <?php endforeach; ?>
62
+ </small>)</span>
63
+ <?php endif; ?>
64
<span class="price-including-tax">
65
<span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax:') ?></span>
66
<span class="price" id="price-including-tax-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPriceInclTax,true,false) ?></span>
68
</span>
69
<?php else: ?>
70
<span class="price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo Mage::helper('core')->currency($_finalPrice,true,false) ?></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
<?php endif; ?>
87
</p>
88
</div>
app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/radio.phtml CHANGED
@@ -43,7 +43,7 @@
43
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
44
<?php endif; ?>
45
<?php endif; ?>
46
- <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?>&nbsp;</label><input onkeyup="bundle.changeOptionQty(this)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
47
</span>
48
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required">&nbsp;*</span>' ?></label>
49
</dt>
43
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
44
<?php endif; ?>
45
<?php endif; ?>
46
+ <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?>&nbsp;</label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
47
</span>
48
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required">&nbsp;*</span>' ?></label>
49
</dt>
app/design/frontend/blank/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml CHANGED
@@ -42,7 +42,7 @@
42
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
43
<?php endif; ?>
44
<?php endif; ?>
45
- <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?>&nbsp;</label><input onkeyup="bundle.changeOptionQty(this)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
46
</span>
47
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required">&nbsp;*</span>' ?></label>
48
</dt>
42
<?php $_canChangeQty = $_selections[0]->getSelectionCanChangeQty() ?>
43
<?php endif; ?>
44
<?php endif; ?>
45
+ <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $this->__('Qty:') ?>&nbsp;</label><input onkeyup="bundle.changeOptionQty(this, event)" onblur="bundle.changeOptionQty(this, event)" <?php echo $_canChangeQty?'':'disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php echo $_canChangeQty?'':' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
46
</span>
47
<label><?php echo $this->htmlEscape($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<span class="required">&nbsp;*</span>' ?></label>
48
</dt>
app/design/frontend/blank/default/template/bundle/email/order/items/creditmemo/default.phtml CHANGED
@@ -25,6 +25,7 @@
25
*/
26
?>
27
<?php $parentItem = $this->getItem() ?>
28
29
<?php $items = $this->getChilds($parentItem) ?>
30
@@ -66,14 +67,80 @@
66
</td>
67
<td align="right" valign="top" style="padding:3px 9px">
68
<?php if ($this->canShowPriceInfo($_item)): ?>
69
- <?php if ($this->helper('tax')->displayCartPriceInclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
70
- <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
71
- <?php elseif ($this->helper('tax')->displayCartPriceExclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
72
- <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?>
73
<?php else: ?>
74
- <?php echo Mage::helper('tax')->__('Excl. Tax'); ?>: <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?><br />
75
- <?php echo Mage::helper('tax')->__('Incl. Tax'); ?>: <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
76
<?php endif; ?>
77
<?php else: ?>
78
&nbsp;
79
<?php endif; ?>
25
*/
26
?>
27
<?php $parentItem = $this->getItem() ?>
28
+ <?php $_order = $this->getItem()->getOrder(); ?>
29
30
<?php $items = $this->getChilds($parentItem) ?>
31
67
</td>
68
<td align="right" valign="top" style="padding:3px 9px">
69
<?php if ($this->canShowPriceInfo($_item)): ?>
70
+ <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
71
+ <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
72
+ <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
73
+ <?php endif; ?>
74
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
75
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
76
<?php else: ?>
77
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
78
+ <?php endif; ?>
79
+
80
+
81
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
82
+ <br />
83
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
84
+ <small>
85
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
86
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
87
+ <?php endforeach; ?>
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; ?>
100
+
101
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
102
+ <br />
103
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
104
+ <?php endif; ?>
105
+ <?php endif; ?>
106
+ <?php endif; ?>
107
+
108
+
109
+ <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
110
+ <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
111
+ <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
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; ?>
119
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
120
+ <br />
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())): ?>
128
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
129
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><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']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><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'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
141
+ <?php endif; ?>
142
<?php endif; ?>
143
+ <?php endif; ?>
144
<?php else: ?>
145
&nbsp;
146
<?php endif; ?>
app/design/frontend/blank/default/template/bundle/email/order/items/invoice/default.phtml CHANGED
@@ -28,6 +28,7 @@
28
<?php $parentItem = $this->getItem() ?>
29
<?php $items = $this->getChilds($parentItem) ?>
30
<?php $_index = 0 ?>
31
32
<?php $_prevOptionId = '' ?>
33
@@ -67,14 +68,80 @@
67
</td>
68
<td align="right" valign="top" style="padding:3px 9px">
69
<?php if ($this->canShowPriceInfo($_item)): ?>
70
- <?php if ($this->helper('tax')->displayCartPriceInclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
71
- <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
72
- <?php elseif ($this->helper('tax')->displayCartPriceExclTax($_item->getOrderItem()->getOrder()->getStore())): ?>
73
- <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?>
74
<?php else: ?>
75
- <?php echo Mage::helper('tax')->__('Excl. Tax'); ?>: <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal()) ?><br />
76
- <?php echo Mage::helper('tax')->__('Incl. Tax'); ?>: <?php echo $_item->getOrderItem()->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxAmount()) ?>
77
<?php endif; ?>
78
<?php else: ?>
79
&nbsp;
80
<?php endif; ?>
28
<?php $parentItem = $this->getItem() ?>
29
<?php $items = $this->getChilds($parentItem) ?>
30
<?php $_index = 0 ?>
31
+ <?php $_order = $this->getItem()->getOrder(); ?>
32
33
<?php $_prevOptionId = '' ?>
34
68
</td>
69
<td align="right" valign="top" style="padding:3px 9px">
70
<?php if ($this->canShowPriceInfo($_item)): ?>
71
+ <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
72
+ <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
73
+ <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
74
+ <?php endif; ?>
75
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
76
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
77
<?php else: ?>
78
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
79
+ <?php endif; ?>
80
+
81
+
82
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
83
+ <br />
84
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
85
+ <small>
86
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
87
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
88
+ <?php endforeach; ?>
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; ?>
101
+
102
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
103
+ <br />
104
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
105
+ <?php endif; ?>
106
+ <?php endif; ?>
107
+ <?php endif; ?>
108
+
109
+
110
+ <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
111
+ <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
112
+ <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
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; ?>
120
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
121
+ <br />
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())): ?>
129
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
130
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
131
+ <?php endforeach; ?>
132
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
133
+ <small>
134
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
135
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
136
+ <?php endforeach; ?>
137
+ </small>
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; ?>
145
<?php else: ?>
146
&nbsp;
147
<?php endif; ?>
app/design/frontend/blank/default/template/bundle/email/order/items/order/default.phtml CHANGED
@@ -25,6 +25,7 @@
25
*/
26
?>
27
<?php $_item = $this->getItem() ?>
28
29
<?php $parentItem = $this->getItem() ?>
30
<?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
@@ -67,13 +68,79 @@
67
</td>
68
<td align="right" valign="top" style="padding:3px 9px">
69
<?php if (!$_item->getParentItem()): ?>
70
- <?php if ($this->helper('tax')->displayCartPriceInclTax($_item->getOrder()->getStore())): ?>
71
- <?php echo $_item->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxBeforeDiscount()) ?>
72
- <?php elseif ($this->helper('tax')->displayCartPriceExclTax($_item->getOrder()->getStore())): ?>
73
- <?php echo $_item->getOrder()->formatPrice($_item->getRowTotal()) ?>
74
- <?php else: ?>
75
- <?php echo Mage::helper('tax')->__('Excl. Tax'); ?>: <?php echo $_item->getOrder()->formatPrice($_item->getRowTotal()) ?><br />
76
- <?php echo Mage::helper('tax')->__('Incl. Tax'); ?>: <?php echo $_item->getOrder()->formatPrice($_item->getRowTotal() + $_item->getTaxBeforeDiscount()) ?>
77
<?php endif; ?>
78
<?php else: ?>
79
&nbsp;
25
*/
26
?>
27
<?php $_item = $this->getItem() ?>
28
+ <?php $_order=$this->getOrder() ?>
29
30
<?php $parentItem = $this->getItem() ?>
31
<?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
68
</td>
69
<td align="right" valign="top" style="padding:3px 9px">
70
<?php if (!$_item->getParentItem()): ?>
71
+ <?php if ($this->helper('tax')->displayCartPriceExclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
72
+ <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
73
+ <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
74
+ <?php endif; ?>
75
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
76
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
77
+ <?php else: ?>
78
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
79
+ <?php endif; ?>
80
+
81
+
82
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
83
+ <br />
84
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
85
+ <small>
86
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
87
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
88
+ <?php endforeach; ?>
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; ?>
101
+
102
+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
103
+ <br />
104
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
105
+ <?php endif; ?>
106
+ <?php endif; ?>
107
+ <?php endif; ?>
108
+
109
+
110
+ <?php if ($this->helper('tax')->displayCartPriceInclTax($_order->getStore()) || $this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
111
+ <?php if ($this->helper('tax')->displayCartBothPrices($_order->getStore())): ?>
112
+ <br /><span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
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; ?>
120
+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
121
+ <br />
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())): ?>
129
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
130
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
131
+ <?php endforeach; ?>
132
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
133
+ <small>
134
+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
135
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
136
+ <?php endforeach; ?>
137
+ </small>
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; ?>
145
<?php else: ?>
146
&nbsp;
app/design/frontend/blank/default/template/bundle/sales/order/creditmemo/items/renderer.phtml CHANGED
@@ -27,6 +27,7 @@
27
<?php $parentItem = $this->getItem() ?>
28
29
<?php $items = $this->getChilds($parentItem) ?>
30
<?php $_count = count ($items) ?>
31
<?php $_index = 0 ?>
32
@@ -65,22 +66,120 @@
65
<td><?php echo $_item->getSku() ?></td>
66
<td class="a-right">
67
<?php if ($this->canShowPriceInfo($_item)): ?>
68
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
69
- <span class="price-excl-tax">
70
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
71
- <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
72
<?php endif; ?>
73
- <?php echo $this->getOrder()->formatPrice($_item->getPrice()) ?>
74
- </span>
75
- <?php endif; ?>
76
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
77
- <span class="price-incl-tax">
78
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
79
- <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
80
<?php endif; ?>
81
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
82
- </span>
83
- <?php endif; ?>
84
<?php else: ?>
85
&nbsp;
86
<?php endif; ?>
@@ -94,18 +193,72 @@
94
</td>
95
<td class="a-right">
96
<?php if ($this->canShowPriceInfo($_item)): ?>
97
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
98
- <span class="price-excl-tax">
99
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
100
- <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
101
<?php endif; ?>
102
- <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()) ?>
103
- </span>
104
- <?php endif; ?>
105
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
106
- <span class="price-incl-tax">
107
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
108
- <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
109
<?php endif; ?>
110
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
111
</span>
@@ -123,7 +276,7 @@
123
</td>
124
<td class="last a-right">
125
<?php if ($this->canShowPriceInfo($_item)): ?>
126
- <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()) ?>
127
<?php else: ?>
128
&nbsp;
129
<?php endif; ?>
27
<?php $parentItem = $this->getItem() ?>
28
29
<?php $items = $this->getChilds($parentItem) ?>
30
+ <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
31
<?php $_count = count ($items) ?>
32
<?php $_index = 0 ?>
33
66
<td><?php echo $_item->getSku() ?></td>
67
<td class="a-right">
68
<?php if ($this->canShowPriceInfo($_item)): ?>
69
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
70
+ <span class="price-excl-tax">
71
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
72
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
77
+ </div>
78
<?php endif; ?>
79
+ <?php endif; ?>
80
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
81
+ <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
82
+ <?php else: ?>
83
+ <div class="cart-price">
84
+ <?php endif; ?>
85
+
86
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
93
+
94
+
95
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
96
+
97
+ <div 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') && $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') && $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') && $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
+ </div>
116
+
117
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
118
+ <div 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
+ </div>
121
+ <?php endif; ?>
122
+ <?php endif; ?>
123
+ </span>
124
+ <br /><br />
125
+ <?php endif; ?>
126
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
127
+ <span class="price-incl-tax">
128
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
129
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
134
+ </div>
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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
139
+ <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
140
+ <?php else: ?>
141
+ <div class="cart-price">
142
+ <?php endif; ?>
143
+
144
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
151
+
152
+
153
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
154
+
155
+ <div 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') && $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') && $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') && $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
+ </div>
174
+
175
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
176
+ <div 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
+ </div>
179
+ <?php endif; ?>
180
+ <?php endif; ?>
181
+ </span>
182
+ <?php endif; ?>
183
<?php else: ?>
184
&nbsp;
185
<?php endif; ?>
193
</td>
194
<td class="a-right">
195
<?php if ($this->canShowPriceInfo($_item)): ?>
196
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
197
+ <span class="price-excl-tax">
198
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
199
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
200
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
204
+ </div>
205
+ <?php endif; ?>
206
+ <?php endif; ?>
207
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
208
+ <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
209
+ <?php else: ?>
210
+ <div class="cart-price">
211
+ <?php endif; ?>
212
+
213
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
220
+
221
+
222
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
223
+
224
+ <div 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') && $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') && $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') && $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
+ </div>
243
+
244
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
245
+ <div 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
+ </div>
248
+ <?php endif; ?>
249
+ <?php endif; ?>
250
+ </span>
251
+ <br /><br />
252
+ <?php endif; ?>
253
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
254
+ <span class="price-incl-tax">
255
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
256
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
261
+ </div>
262
<?php endif; ?>
263
<?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
264
</span>
276
</td>
277
<td class="last a-right">
278
<?php if ($this->canShowPriceInfo($_item)): ?>
279
+ <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
280
<?php else: ?>
281
&nbsp;
282
<?php endif; ?>
app/design/frontend/blank/default/template/bundle/sales/order/invoice/items/renderer.phtml CHANGED
@@ -25,6 +25,7 @@
25
*/
26
?>
27
<?php $parentItem = $this->getItem() ?>
28
29
<?php $items = $this->getChilds($parentItem) ?>
30
<?php $_count = count ($items) ?>
@@ -62,22 +63,120 @@
62
<td><?php echo $_item->getSku() ?></td>
63
<td class="a-right">
64
<?php if ($this->canShowPriceInfo($_item)): ?>
65
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
66
- <span class="price-excl-tax">
67
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
68
- <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
69
<?php endif; ?>
70
- <?php echo $this->getOrder()->formatPrice($_item->getPrice()) ?>
71
- </span>
72
- <?php endif; ?>
73
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
74
- <span class="price-incl-tax">
75
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
76
- <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
77
<?php endif; ?>
78
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
79
- </span>
80
- <?php endif; ?>
81
<?php else: ?>
82
&nbsp;
83
<?php endif; ?>
@@ -91,22 +190,122 @@
91
</td>
92
<td class="a-right">
93
<?php if ($this->canShowPriceInfo($_item)): ?>
94
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
95
- <span class="price-excl-tax">
96
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
97
- <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
98
<?php endif; ?>
99
- <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()) ?>
100
- </span>
101
- <?php endif; ?>
102
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
103
- <span class="price-incl-tax">
104
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
105
- <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
106
<?php endif; ?>
107
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
108
- </span>
109
- <?php endif; ?>
110
<?php else: ?>
111
&nbsp;
112
<?php endif; ?>
25
*/
26
?>
27
<?php $parentItem = $this->getItem() ?>
28
+ <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
30
<?php $items = $this->getChilds($parentItem) ?>
31
<?php $_count = count ($items) ?>
63
<td><?php echo $_item->getSku() ?></td>
64
<td class="a-right">
65
<?php if ($this->canShowPriceInfo($_item)): ?>
66
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
67
+ <span class="price-excl-tax">
68
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
69
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
70
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
74
+ </div>
75
<?php endif; ?>
76
+ <?php endif; ?>
77
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
78
+ <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
79
+ <?php else: ?>
80
+ <div class="cart-price">
81
+ <?php endif; ?>
82
+
83
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
90
+
91
+
92
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
93
+
94
+ <div 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') && $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') && $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') && $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
+ </div>
113
+
114
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
115
+ <div 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
+ </div>
118
+ <?php endif; ?>
119
+ <?php endif; ?>
120
+ </span>
121
+ <br /><br />
122
+ <?php endif; ?>
123
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
124
+ <span class="price-incl-tax">
125
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
126
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
127
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
131
+ </div>
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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
+ <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
137
+ <?php else: ?>
138
+ <div class="cart-price">
139
+ <?php endif; ?>
140
+
141
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
148
+
149
+
150
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
151
+
152
+ <div 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') && $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') && $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') && $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
+ </div>
171
+
172
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
173
+ <div 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
+ </div>
176
+ <?php endif; ?>
177
+ <?php endif; ?>
178
+ </span>
179
+ <?php endif; ?>
180
<?php else: ?>
181
&nbsp;
182
<?php endif; ?>
190
</td>
191
<td class="a-right">
192
<?php if ($this->canShowPriceInfo($_item)): ?>
193
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
194
+ <span class="price-excl-tax">
195
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
196
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
197
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
201
+ </div>
202
<?php endif; ?>
203
+ <?php endif; ?>
204
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
205
+ <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
206
+ <?php else: ?>
207
+ <div class="cart-price">
208
+ <?php endif; ?>
209
+
210
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
217
+
218
+
219
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
220
+
221
+ <div 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') && $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') && $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') && $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
+ </div>
240
+
241
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
242
+ <div 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
+ </div>
245
+ <?php endif; ?>
246
+ <?php endif; ?>
247
+ </span>
248
+ <br /><br />
249
+ <?php endif; ?>
250
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
251
+ <span class="price-incl-tax">
252
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
253
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
254
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
258
+ </div>
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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
263
+ <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
264
+ <?php else: ?>
265
+ <div class="cart-price">
266
+ <?php endif; ?>
267
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
274
+
275
+
276
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
277
+
278
+ <div 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') && $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') && $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') && $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
+ </div>
297
+
298
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
299
+ <div 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
+ </div>
302
+ <?php endif; ?>
303
+ <?php endif; ?>
304
+
305
+
306
+
307
+ </span>
308
+ <?php endif; ?>
309
<?php else: ?>
310
&nbsp;
311
<?php endif; ?>
app/design/frontend/blank/default/template/bundle/sales/order/items/renderer.phtml CHANGED
@@ -62,22 +62,120 @@
62
<td><?php echo Mage::helper('core/string')->splitInjection($_item->getSku()) ?></td>
63
<td class="a-right">
64
<?php if (!$_item->getParentItem()): ?>
65
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
66
- <span class="price-excl-tax">
67
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
68
- <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
69
<?php endif; ?>
70
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
71
- </span>
72
- <?php endif; ?>
73
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
74
- <span class="price-incl-tax">
75
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
76
- <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
77
<?php endif; ?>
78
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($this->getItem())); ?>
79
- </span>
80
- <?php endif; ?>
81
<?php else: ?>
82
&nbsp;
83
<?php endif; ?>
@@ -107,22 +205,122 @@
107
</td>
108
<td class="a-right">
109
<?php if (!$_item->getParentItem()): ?>
110
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
111
- <span class="price-excl-tax">
112
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
113
- <span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax'); ?>:</span>
114
<?php endif; ?>
115
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
116
- </span>
117
- <?php endif; ?>
118
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
119
- <span class="price-incl-tax">
120
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
121
- <span class="label"><?php echo Mage::helper('tax')->__('Incl. Tax'); ?>:</span>
122
<?php endif; ?>
123
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?>
124
- </span>
125
- <?php endif; ?>
126
<?php else: ?>
127
&nbsp;
128
<?php endif; ?>
62
<td><?php echo Mage::helper('core/string')->splitInjection($_item->getSku()) ?></td>
63
<td class="a-right">
64
<?php if (!$_item->getParentItem()): ?>
65
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
66
+ <span class="price-excl-tax">
67
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
68
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
69
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
+ </div>
74
<?php endif; ?>
75
+ <?php endif; ?>
76
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
77
+ <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
78
+ <?php else: ?>
79
+ <div class="cart-price">
80
+ <?php endif; ?>
81
+
82
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
89
+
90
+
91
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
92
+
93
+ <div 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') && $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') && $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') && $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
+ </div>
112
+
113
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
114
+ <div 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
+ </div>
117
+ <?php endif; ?>
118
+ <?php endif; ?>
119
+ </span>
120
+ <br /><br />
121
+ <?php endif; ?>
122
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
123
+ <span class="price-incl-tax">
124
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
125
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
126
+ <div 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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
+ </div>
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') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
135
+ <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
136
+ <?php else: ?>
137
+ <div class="cart-price">
138
+ <?php endif; ?>
139
+
140
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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
+ </div>
147
+
148
+
149
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
150
+
151
+ <div 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') && $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') && $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') && $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
+ </div>
170
+
171
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
172
+ <div 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
+ </div>
175
+ <?php endif; ?>
176
+ <?php endif; ?>
177
+ </span>
178
+ <?php endif; ?>
179
<?php else: ?>
180
&nbsp;
181
<?php endif; ?>
205
</td>
206
<td class="a-right">
207
<?php if (!$_item->getParentItem()): ?>
208
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
209
+ <span class="price-excl-tax">
210
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
211
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
212
+ <div class="cart-price">
213
<?php endif; ?>
214
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
215
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
216
+ </div>
217
<?php endif; ?>
218
+ <?php endif; ?>
219
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
220
+ <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
221
+ <?php else: ?>
222
+ <div class="cart-price">
223
+ <?php endif; ?>
224
+
225
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
227
+ <?php else: ?>
228
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
229
+ <?php endif; ?>
230
+
231
+ </div>
232
+
233
+
234
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
235
+
236
+ <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
237
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $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 elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $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') && $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; ?>
254
+ </div>
255
+
256
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
+ <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
258
+ <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>
259
+ </div>
260
+ <?php endif; ?>
261
+ <?php endif; ?>
262
+ </span>
263
+ <br /><br />
264
+ <?php endif; ?>
265
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
266
+ <span class="price-incl-tax">
267
+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
268
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
269
+ <div class="cart-price">
270
+ <?php endif; ?>
271
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
272
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
+ </div>
274
+ <?php endif; ?>
275
+ <?php endif; ?>
276
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
277
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
278
+ <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
279
+ <?php else: ?>
280
+ <div class="cart-price">
281
+ <?php endif; ?>
282
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $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; ?>
287
+
288
+ </div>
289
+
290
+
291
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
292
+
293
+ <div class="cart-tax-info" id="subtotal-item-tax-detail