Interface_Frontend_Default_Blank - Version 1.2.1

Version Notes

1.2.1

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_Default_Blank
Version 1.2.1
Comparing to
See all releases


Code changes from version 1.2.0.3 to 1.2.1

Files changed (57) hide show
  1. app/design/frontend/default/blank/layout/bundle.xml +1 -1
  2. app/design/frontend/default/blank/template/bundle/sales/order/creditmemo/items/renderer.phtml +94 -91
  3. app/design/frontend/default/blank/template/bundle/sales/order/invoice/items/renderer.phtml +58 -58
  4. app/design/frontend/default/blank/template/bundle/sales/order/items/renderer.phtml +57 -57
  5. app/design/frontend/default/blank/template/bundle/sales/order/shipment/items/renderer.phtml +1 -1
  6. app/design/frontend/default/blank/template/catalog/product/compare/sidebar.phtml +1 -1
  7. app/design/frontend/default/blank/template/catalog/product/list/related.phtml +1 -1
  8. app/design/frontend/default/blank/template/catalog/product/price.phtml +1 -1
  9. app/design/frontend/default/blank/template/catalog/product/view.phtml +1 -1
  10. app/design/frontend/default/blank/template/catalog/seo/sitemap.phtml +1 -1
  11. app/design/frontend/default/blank/template/catalogsearch/advanced/result.phtml +1 -1
  12. app/design/frontend/default/blank/template/checkout/cart/crosssell.phtml +1 -1
  13. app/design/frontend/default/blank/template/checkout/cart/item/default.phtml +1 -1
  14. app/design/frontend/default/blank/template/checkout/cart/render/default.phtml +1 -1
  15. app/design/frontend/default/blank/template/checkout/cart/render/simple.phtml +1 -1
  16. app/design/frontend/default/blank/template/checkout/cart/sidebar/default.phtml +1 -9
  17. app/design/frontend/default/blank/template/checkout/multishipping/addresses.phtml +1 -1
  18. app/design/frontend/default/blank/template/checkout/multishipping/billing.phtml +1 -1
  19. app/design/frontend/default/blank/template/checkout/onepage/review/info.phtml +3 -3
  20. app/design/frontend/default/blank/template/customer/address/edit.phtml +1 -1
  21. app/design/frontend/default/blank/template/customer/form/edit.phtml +4 -2
  22. app/design/frontend/default/blank/template/customer/form/newsletter.phtml +6 -4
  23. app/design/frontend/default/blank/template/downloadable/catalog/product/links.phtml +4 -0
  24. app/design/frontend/default/blank/template/downloadable/catalog/product/type.phtml +3 -7
  25. app/design/frontend/default/blank/template/downloadable/checkout/cart/item/default.phtml +1 -2
  26. app/design/frontend/default/blank/template/downloadable/customer/products/list.phtml +31 -24
  27. app/design/frontend/default/blank/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +0 -1
  28. app/design/frontend/default/blank/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +0 -1
  29. app/design/frontend/default/blank/template/downloadable/sales/order/items/renderer.phtml +0 -130
  30. app/design/frontend/default/blank/template/downloadable/sales/order/items/renderer/downloadable.phtml +1 -2
  31. app/design/frontend/default/blank/template/page/switch/stores.phtml +1 -1
  32. app/design/frontend/default/blank/template/page/template/links.phtml +1 -1
  33. app/design/frontend/default/blank/template/paypal/express/review.phtml +73 -75
  34. app/design/frontend/default/blank/template/paypal/express/review/details.phtml +1 -1
  35. app/design/frontend/default/blank/template/sales/order/creditmemo/items.phtml +4 -6
  36. app/design/frontend/default/blank/template/sales/order/creditmemo/items/renderer/default.phtml +58 -58
  37. app/design/frontend/default/blank/template/sales/order/history.phtml +1 -1
  38. app/design/frontend/default/blank/template/sales/order/info.phtml +1 -1
  39. app/design/frontend/default/blank/template/sales/order/invoice/items.phtml +3 -5
  40. app/design/frontend/default/blank/template/sales/order/invoice/items/renderer/default.phtml +58 -58
  41. app/design/frontend/default/blank/template/sales/order/items/renderer/default.phtml +57 -57
  42. app/design/frontend/default/blank/template/sales/order/print.phtml +1 -1
  43. app/design/frontend/default/blank/template/sales/order/print/creditmemo.phtml +1 -1
  44. app/design/frontend/default/blank/template/sales/order/print/invoice.phtml +1 -1
  45. app/design/frontend/default/blank/template/sales/order/print/shipment.phtml +1 -1
  46. app/design/frontend/default/blank/template/sales/order/recent.phtml +1 -1
  47. app/design/frontend/default/blank/template/sales/order/shipment/items.phtml +7 -9
  48. app/design/frontend/default/blank/template/sales/order/shipment/items/renderer/default.phtml +1 -1
  49. app/design/frontend/default/blank/template/sales/order/view.phtml +1 -1
  50. app/design/frontend/default/blank/template/sales/reorder/sidebar.phtml +1 -1
  51. app/design/frontend/default/blank/template/shipping/tracking/popup.phtml +4 -2
  52. app/design/frontend/default/blank/template/wishlist/sharing.phtml +1 -1
  53. app/design/frontend/default/blank/template/wishlist/sidebar.phtml +1 -1
  54. package.xml +6 -6
  55. skin/frontend/default/blank/css/reset.css +1 -0
  56. skin/frontend/default/blank/css/styles-ie.css +2 -1
  57. skin/frontend/default/blank/css/styles.css +11 -2
app/design/frontend/default/blank/layout/bundle.xml CHANGED
@@ -99,7 +99,7 @@ Adding custom product price block
99
</catalog_product_view>
100
101
<!--
102
- Partof block for simple broducts
103
-->
104
105
<PRODUCT_TYPE_simple>
99
</catalog_product_view>
100
101
<!--
102
+ Partof block for simple products
103
-->
104
105
<PRODUCT_TYPE_simple>
app/design/frontend/default/blank/template/bundle/sales/order/creditmemo/items/renderer.phtml CHANGED
@@ -58,7 +58,7 @@
58
<?php endif; ?>
59
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
60
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
61
- <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
62
</td>
63
<?php else: ?>
64
<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
@@ -69,43 +69,43 @@
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>
@@ -113,57 +113,57 @@
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>
@@ -171,8 +171,8 @@
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>
@@ -193,75 +193,78 @@
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>
265
<?php endif; ?>
266
<?php else: ?>
267
&nbsp;
58
<?php endif; ?>
59
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
60
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
61
+ <td><h5 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
62
</td>
63
<?php else: ?>
64
<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
77
</div>
78
<?php endif; ?>
79
<?php endif; ?>
80
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
87
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
88
<?php else: ?>
89
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
90
<?php endif; ?>
91
+
92
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
99
<small>
100
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
101
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
102
<?php endforeach; ?>
103
</small>
104
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
106
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
107
<?php endforeach; ?>
108
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
<small>
110
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
111
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
113
</small>
114
<?php endif; ?>
115
</div>
116
+
117
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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 />
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') && (float)$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') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
145
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
146
<?php else: ?>
147
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
148
<?php endif; ?>
149
+
150
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
157
<small>
158
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
159
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
160
<?php endforeach; ?>
161
</small>
162
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
163
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
164
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
165
<?php endforeach; ?>
166
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
167
<small>
168
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
169
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
171
</small>
172
<?php endif; ?>
173
</div>
174
+
175
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
204
+ </div>
205
+ <?php endif; ?>
206
<?php endif; ?>
207
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
214
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
215
+ <?php else: ?>
216
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
217
<?php endif; ?>
218
+
219
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
+ <small>
227
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
228
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
229
+ <?php endforeach; ?>
230
+ </small>
231
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
232
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
233
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
234
+ <?php endforeach; ?>
235
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
236
+ <small>
237
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
238
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
239
+ <?php endforeach; ?>
240
+ </small>
241
+ <?php endif; ?>
242
</div>
243
+
244
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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 />
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
261
+ </div>
262
+ <?php endif; ?>
263
+ <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
264
+ </span>
265
+ <?php endif; ?>
266
+ <?php else: ?>
267
+ &nbsp;
268
<?php endif; ?>
269
<?php else: ?>
270
&nbsp;
app/design/frontend/default/blank/template/bundle/sales/order/invoice/items/renderer.phtml CHANGED
@@ -56,7 +56,7 @@
56
<?php endif; ?>
57
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
58
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
59
- <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4></td>
60
<?php else: ?>
61
<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
62
<?php endif; ?>
@@ -66,43 +66,43 @@
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>
@@ -110,57 +110,57 @@
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>
@@ -168,8 +168,8 @@
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>
@@ -193,43 +193,43 @@
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>
@@ -237,56 +237,56 @@
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>
@@ -294,8 +294,8 @@
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>
56
<?php endif; ?>
57
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
58
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
59
+ <td><h5 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h5></td>
60
<?php else: ?>
61
<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
62
<?php endif; ?>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
74
</div>
75
<?php endif; ?>
76
<?php endif; ?>
77
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
85
<?php else: ?>
86
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
87
<?php endif; ?>
88
+
89
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
96
<small>
97
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
98
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
99
<?php endforeach; ?>
100
</small>
101
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
102
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
103
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
104
<?php endforeach; ?>
105
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
106
<small>
107
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
108
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
110
</small>
111
<?php endif; ?>
112
</div>
113
+
114
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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 />
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') && (float)$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') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
143
<?php else: ?>
144
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
145
<?php endif; ?>
146
+
147
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
<small>
155
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
156
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
157
<?php endforeach; ?>
158
</small>
159
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
160
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
161
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
162
<?php endforeach; ?>
163
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
164
<small>
165
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
166
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
168
</small>
169
<?php endif; ?>
170
</div>
171
+
172
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
201
</div>
202
<?php endif; ?>
203
<?php endif; ?>
204
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
211
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
212
<?php else: ?>
213
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
214
<?php endif; ?>
215
+
216
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
223
<small>
224
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
225
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
226
<?php endforeach; ?>
227
</small>
228
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
229
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
230
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
231
<?php endforeach; ?>
232
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
233
<small>
234
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
235
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
237
</small>
238
<?php endif; ?>
239
</div>
240
+
241
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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 />
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') && (float)$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') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
268
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
269
<?php else: ?>
270
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
271
<?php endif; ?>
272
+
273
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
280
<small>
281
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
282
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
283
<?php endforeach; ?>
284
</small>
285
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
287
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
288
<?php endforeach; ?>
289
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
290
<small>
291
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
292
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
294
</small>
295
<?php endif; ?>
296
</div>
297
+
298
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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>
app/design/frontend/default/blank/template/bundle/sales/order/items/renderer.phtml CHANGED
@@ -65,43 +65,43 @@
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>
@@ -109,57 +109,57 @@
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>
@@ -167,8 +167,8 @@
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>
@@ -208,43 +208,43 @@
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>
@@ -252,56 +252,56 @@
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-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
294
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
295
<small>
296
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
297
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
298
<?php endforeach; ?>
299
</small>
300
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
301
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
302
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
303
<?php endforeach; ?>
304
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
305
<small>
306
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
307
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
@@ -309,8 +309,8 @@
309
</small>
310
<?php endif; ?>
311
</div>
312
-
313
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
315
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
316
</div>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
</div>
74
<?php endif; ?>
75
<?php endif; ?>
76
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
84
<?php else: ?>
85
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
86
<?php endif; ?>
87
+
88
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
95
<small>
96
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
97
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
98
<?php endforeach; ?>
99
</small>
100
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
103
<?php endforeach; ?>
104
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
105
<small>
106
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
107
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
109
</small>
110
<?php endif; ?>
111
</div>
112
+
113
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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 />
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') && (float)$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') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
142
<?php else: ?>
143
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
144
<?php endif; ?>
145
+
146
</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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
153
<small>
154
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
156
<?php endforeach; ?>
157
</small>
158
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
159
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
160
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
161
<?php endforeach; ?>
162
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
163
<small>
164
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
165
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
167
</small>
168
<?php endif; ?>
169
</div>
170
+
171
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
216
</div>
217
<?php endif; ?>
218
<?php endif; ?>
219
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
<small>
239
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
240
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
241
<?php endforeach; ?>
242
</small>
243
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
244
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
245
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
246
<?php endforeach; ?>
247
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
<small>
249
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
250
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
252
</small>
253
<?php endif; ?>
254
</div>
255
+
256
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$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 />
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') && (float)$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') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
283
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
284
<?php else: ?>
285
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
286
<?php endif; ?>
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-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
294
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
295
<small>
296
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
297
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
298
<?php endforeach; ?>
299
</small>
300
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
301
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
302
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
303
<?php endforeach; ?>
304
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
305
<small>
306
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
307
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
309
</small>
310
<?php endif; ?>
311
</div>
312
+
313
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
315
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
316
</div>
app/design/frontend/default/blank/template/bundle/sales/order/shipment/items/renderer.phtml CHANGED
@@ -53,7 +53,7 @@
53
<?php endif; ?>
54
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
55
<?php if (!$_item->getParentItem()): ?>
56
- <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4></td>
57
<?php else: ?>
58
<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
59
<?php endif; ?>
53
<?php endif; ?>
54
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
55
<?php if (!$_item->getParentItem()): ?>
56
+ <td><h5 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h5></td>
57
<?php else: ?>
58
<td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
59
<?php endif; ?>
app/design/frontend/default/blank/template/catalog/product/compare/sidebar.phtml CHANGED
@@ -45,7 +45,7 @@
45
</ol>
46
<script type="text/javascript">decorateList('compare-items')</script>
47
<div class="actions">
48
- <a href="<?php echo $this->helper('catalog/product_compare')->getClearListUrl() ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove all item from compare products?') ?>');"><?php echo $this->__('Clear All') ?></a>
49
<button class="button" onclick="popWin('<?php echo $this->helper('catalog/product_compare')->getListUrl() ?>','compare','top:50,left:50,width=800,height=600,resizable=yes,scrollbars=yes')"><span><?php echo $this->__('Compare Items') ?></span></button>
50
</div>
51
<?php else: ?>
45
</ol>
46
<script type="text/javascript">decorateList('compare-items')</script>
47
<div class="actions">
48
+ <a href="<?php echo $this->helper('catalog/product_compare')->getClearListUrl() ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove all products from your comparison?') ?>');"><?php echo $this->__('Clear All') ?></a>
49
<button class="button" onclick="popWin('<?php echo $this->helper('catalog/product_compare')->getListUrl() ?>','compare','top:50,left:50,width=800,height=600,resizable=yes,scrollbars=yes')"><span><?php echo $this->__('Compare Items') ?></span></button>
50
</div>
51
<?php else: ?>
app/design/frontend/default/blank/template/catalog/product/list/related.phtml CHANGED
@@ -33,7 +33,7 @@
33
<p><?php echo $this->__('Check items to add to the cart or') ?>&nbsp;<a href="#" onclick="selectAllRelated(this); return false;"><?php echo $this->__('select all') ?></a></p>
34
<ol id="block-related">
35
<?php foreach($this->getItems() as $_item): ?>
36
- <li<?php if($_item->isComposite() || !$_item->isSaleable()): ?> class="super-products"<?php endif; ?>>
37
<?php if(!$_item->isComposite() && $_item->isSaleable()): ?>
38
<?php if (!$_item->getRequiredOptions()): ?>
39
<input type="checkbox" class="checkbox related-checkbox" id="related-checkbox<?php echo $_item->getId() ?>" name="related_products[]" value="<?php echo $_item->getId() ?>" />
33
<p><?php echo $this->__('Check items to add to the cart or') ?>&nbsp;<a href="#" onclick="selectAllRelated(this); return false;"><?php echo $this->__('select all') ?></a></p>
34
<ol id="block-related">
35
<?php foreach($this->getItems() as $_item): ?>
36
+ <li class="item">
37
<?php if(!$_item->isComposite() && $_item->isSaleable()): ?>
38
<?php if (!$_item->getRequiredOptions()): ?>
39
<input type="checkbox" class="checkbox related-checkbox" id="related-checkbox<?php echo $_item->getId() ?>" name="related_products[]" value="<?php echo $_item->getId() ?>" />
app/design/frontend/default/blank/template/catalog/product/price.phtml CHANGED
@@ -319,7 +319,7 @@
319
<?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
320
<div class="price-box">
321
<p class="minimal-price">
322
- <span class="label"><?php echo $this->__('Starting at:') ?></span>
323
<?php if ($this->helper('tax')->displayBothPrices() && ($_exclTax !== $_inclTax)): ?>
324
<span class="price-excluding-tax">
325
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
319
<?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
320
<div class="price-box">
321
<p class="minimal-price">
322
+ <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
323
<?php if ($this->helper('tax')->displayBothPrices() && ($_exclTax !== $_inclTax)): ?>
324
<span class="price-excluding-tax">
325
<span class="label"><?php echo Mage::helper('tax')->__('Excl. Tax:') ?></span>
app/design/frontend/default/blank/template/catalog/product/view.phtml CHANGED
@@ -63,9 +63,9 @@
63
<?php echo $this->getReviewsSummaryHtml($_product, false, true)?>
64
<?php echo $this->getChildHtml('alert_urls') ?>
65
<?php echo $this->getChildHtml('product_type_data') ?>
66
67
<?php if (!$this->hasOptions()):?>
68
- <?php echo $this->getChildHtml('tierprices') ?>
69
<div class="add-to-box">
70
<?php if($_product->isSaleable()): ?>
71
<?php echo $this->getChildHtml('addtocart') ?>
63
<?php echo $this->getReviewsSummaryHtml($_product, false, true)?>
64
<?php echo $this->getChildHtml('alert_urls') ?>
65
<?php echo $this->getChildHtml('product_type_data') ?>
66
+ <?php echo $this->getChildHtml('tierprices') ?>
67
68
<?php if (!$this->hasOptions()):?>
69
<div class="add-to-box">
70
<?php if($_product->isSaleable()): ?>
71
<?php echo $this->getChildHtml('addtocart') ?>
app/design/frontend/default/blank/template/catalog/seo/sitemap.phtml CHANGED
@@ -31,7 +31,7 @@
31
?>
32
<?php $_items = $this->getCollection(); ?>
33
<?php if($_items->getSize()): ?>
34
- <ul>
35
<?php foreach ($_items as $_item): ?>
36
<li><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $_item->name ?></a></li>
37
<?php endforeach; ?>
31
?>
32
<?php $_items = $this->getCollection(); ?>
33
<?php if($_items->getSize()): ?>
34
+ <ul class="sitemap">
35
<?php foreach ($_items as $_item): ?>
36
<li><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $_item->name ?></a></li>
37
<?php endforeach; ?>
app/design/frontend/default/blank/template/catalogsearch/advanced/result.phtml CHANGED
@@ -43,7 +43,7 @@
43
<?php if(@$searchCriterias[$side]): ?>
44
<ul>
45
<?php foreach($searchCriterias[$side] as $criteria): ?>
46
- <li><strong><?php echo $this->htmlEscape($this->helper('catalogsearch')->__($criteria['name'])); ?>:</strong> <?php echo $this->htmlEscape($criteria['value']); ?></li>
47
<?php endforeach; ?>
48
</ul>
49
<?php endif; ?>
43
<?php if(@$searchCriterias[$side]): ?>
44
<ul>
45
<?php foreach($searchCriterias[$side] as $criteria): ?>
46
+ <li><strong><?php echo $this->htmlEscape($this->helper('catalog')->__($criteria['name'])); ?>:</strong> <?php echo $this->htmlEscape($criteria['value']); ?></li>
47
<?php endforeach; ?>
48
</ul>
49
<?php endif; ?>
app/design/frontend/default/blank/template/checkout/cart/crosssell.phtml CHANGED
@@ -36,7 +36,7 @@
36
<h3><?php echo $this->__('Based on your selection, you may be interested in the following items:') ?></h3>
37
<ul>
38
<?php foreach ($this->getItems() as $_item): ?>
39
- <li>
40
<a class="product-image" href="<?php echo $_item->getProductUrl() ?>"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($_item->getName()) ?>" title="<?php echo $this->htmlEscape($_item->getName()) ?>" /></a>
41
<div class="product-shop">
42
<h4 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a></h4>
36
<h3><?php echo $this->__('Based on your selection, you may be interested in the following items:') ?></h3>
37
<ul>
38
<?php foreach ($this->getItems() as $_item): ?>
39
+ <li class="item">
40
<a class="product-image" href="<?php echo $_item->getProductUrl() ?>"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($_item->getName()) ?>" title="<?php echo $this->htmlEscape($_item->getName()) ?>" /></a>
41
<div class="product-shop">
42
<h4 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->htmlEscape($_item->getName()) ?></a></h4>
app/design/frontend/default/blank/template/checkout/cart/item/default.phtml CHANGED
@@ -26,7 +26,7 @@
26
?>
27
<?php $_item = $this->getItem()?>
28
<tr>
29
- <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php echo $this->__('Remove item')?>" title="<?php echo $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getProductUrl() ?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" title="<?php echo $this->htmlEscape($this->getProductName()) ?>" /></a></td>
31
<td>
32
<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h3>
26
?>
27
<?php $_item = $this->getItem()?>
28
<tr>
29
+ <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" alt="<?php echo $this->__('Remove item')?>" title="<?php echo $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getProductUrl() ?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" title="<?php echo $this->htmlEscape($this->getProductName()) ?>" /></a></td>
31
<td>
32
<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h3>
app/design/frontend/default/blank/template/checkout/cart/render/default.phtml CHANGED
@@ -26,7 +26,7 @@
26
?>
27
<?php $_item = $this->getItem() ?>
28
<tr>
29
- <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php echo $this->__('Remove item')?>" title="<?php echo $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getItemUrl($_item) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" title="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" /></a></td>
31
<td>
32
<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
26
?>
27
<?php $_item = $this->getItem() ?>
28
<tr>
29
+ <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" alt="<?php echo $this->__('Remove item')?>" title="<?php echo $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getItemUrl($_item) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" title="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" /></a></td>
31
<td>
32
<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
app/design/frontend/default/blank/template/checkout/cart/render/simple.phtml CHANGED
@@ -26,7 +26,7 @@
26
?>
27
<?php $_item = $this->getItem() ?>
28
<tr>
29
- <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php echo $this->__('Remove item')?>" title="<?php echo $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getItemUrl($_item) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" title="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" /></a></td>
31
<td>
32
<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
26
?>
27
<?php $_item = $this->getItem() ?>
28
<tr>
29
+ <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" alt="<?php echo $this->__('Remove item')?>" title="<?php echo $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getItemUrl($_item) ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($this->getItemProductForThumbnail($_item), 'thumbnail')->resize(75); ?>" width="75" alt="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" title="<?php echo $this->htmlEscape($this->getItemName($_item)) ?>" /></a></td>
31
<td>
32
<h3 class="product-name"><a href="<?php echo $this->getItemUrl($_item) ?>"><?php echo $this->getItemName($_item) ?></a></h3>
app/design/frontend/default/blank/template/checkout/cart/sidebar/default.phtml CHANGED
@@ -25,7 +25,7 @@
25
*/
26
?>
27
<?php $_item = $this->getItem() ?>
28
- <li>
29
<a href="<?php echo $this->getProductUrl()?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" title="<?php echo $this->htmlEscape($this->getProductName()) ?>" /></a>
30
<div class="product-details">
31
<a href="<?php echo $this->getDeleteUrl() ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>');" class="btn-remove"><img src="<?php echo $this->getSkinUrl('images/list_remove_btn.gif') ?>" alt="<?php echo $this->__('Remove Product') ?>" title="<?php echo $this->__('Remove Product') ?>" /></a>
@@ -34,13 +34,6 @@
34
35
36
37
-
38
-
39
-
40
-
41
-
42
-
43
-
44
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
45
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
46
<?php echo $this->__('Excl. Tax'); ?>:
@@ -77,7 +70,6 @@
77
78
79
80
-
81
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
82
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
83
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
25
*/
26
?>
27
<?php $_item = $this->getItem() ?>
28
+ <li class="item">
29
<a href="<?php echo $this->getProductUrl()?>" class="product-image"><img src="<?php echo $this->getProductThumbnail()->resize(50, 50)->setWatermarkSize('30x10'); ?>" width="50" height="50" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" title="<?php echo $this->htmlEscape($this->getProductName()) ?>" /></a>
30
<div class="product-details">
31
<a href="<?php echo $this->getDeleteUrl() ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the shopping cart?') ?>');" class="btn-remove"><img src="<?php echo $this->getSkinUrl('images/list_remove_btn.gif') ?>" alt="<?php echo $this->__('Remove Product') ?>" title="<?php echo $this->__('Remove Product') ?>" /></a>
34
35
36
37
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
38
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
39
<?php echo $this->__('Excl. Tax'); ?>:
70
71
72
73
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
74
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
75
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
app/design/frontend/default/blank/template/checkout/multishipping/addresses.phtml CHANGED
@@ -65,7 +65,7 @@
65
<td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
66
<td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->htmlEscape($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
67
<td><?php if ($_item->getProduct()->getIsVirtual()): echo $this->__('Shipping selection is not applicable'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
68
- <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php echo $this->__('Remove Item') ?>" title="<?php echo $this->__('Remove Item') ?>" /></a></td>
69
</tr>
70
<?php endforeach; ?>
71
</tbody>
65
<td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
66
<td><input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->htmlEscape($_item->getQty()) ?>" size="2" class="input-text qty" /></td>
67
<td><?php if ($_item->getProduct()->getIsVirtual()): echo $this->__('Shipping selection is not applicable'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
68
+ <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" alt="<?php echo $this->__('Remove Item') ?>" title="<?php echo $this->__('Remove Item') ?>" /></a></td>
69
</tr>
70
<?php endforeach; ?>
71
</tbody>
app/design/frontend/default/blank/template/checkout/multishipping/billing.phtml CHANGED
@@ -76,7 +76,7 @@
76
</fieldset>
77
<div class="buttons-set">
78
<a href="<?php echo $this->getBackUrl() ?>" class="back-link">&laquo; <?php echo $this->__('Back to Shipping Information') ?></a>
79
- <button class="button" type="submit"><span><?php echo $this->__('Continue to Review Your Order') ?></span></button>
80
</div>
81
</form>
82
<script type="text/javascript">
76
</fieldset>
77
<div class="buttons-set">
78
<a href="<?php echo $this->getBackUrl() ?>" class="back-link">&laquo; <?php echo $this->__('Back to Shipping Information') ?></a>
79
+ <button type="submit" class="button"><span><?php echo $this->__('Continue to Review Your Order') ?></span></button>
80
</div>
81
</form>
82
<script type="text/javascript">
app/design/frontend/default/blank/template/checkout/onepage/review/info.phtml CHANGED
@@ -37,9 +37,9 @@
37
<thead>
38
<tr>
39
<th rowspan="<?php echo $rowspan ?>"><?php echo $this->__('Product Name') ?></th>
40
- <th colspan="<?php echo $colspan ?>" width="10%" class="a-center"><?php echo $this->__('Price') ?></th>
41
- <th rowspan="<?php echo $rowspan ?>" width="5%"><?php echo $this->__('Qty') ?></th>
42
- <th colspan="<?php echo $colspan ?>" width="10%" class="a-center"><?php echo $this->__('Subtotal') ?></th>
43
</tr>
44
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
45
<tr>
37
<thead>
38
<tr>
39
<th rowspan="<?php echo $rowspan ?>"><?php echo $this->__('Product Name') ?></th>
40
+ <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo $this->__('Price') ?></th>
41
+ <th rowspan="<?php echo $rowspan ?>"><?php echo $this->__('Qty') ?></th>
42
+ <th colspan="<?php echo $colspan ?>" class="a-right"><?php echo $this->__('Subtotal') ?></th>
43
</tr>
44
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
45
<tr>
app/design/frontend/default/blank/template/customer/address/edit.phtml CHANGED
@@ -38,8 +38,8 @@
38
<?php endif; ?>
39
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
40
<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
41
- <?php echo $this->getBlockHtml('formkey')?>
42
<fieldset class="group-select">
43
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
44
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
45
<h3><?php echo $this->__('Contact Information') ?></h3>
38
<?php endif; ?>
39
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
40
<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
41
<fieldset class="group-select">
42
+ <?php echo $this->getBlockHtml('formkey')?>
43
<input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
44
<input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
45
<h3><?php echo $this->__('Contact Information') ?></h3>
app/design/frontend/default/blank/template/customer/form/edit.phtml CHANGED
@@ -29,8 +29,8 @@
29
</div>
30
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
32
- <?php echo $this->getBlockHtml('formkey')?>
33
<fieldset class="group-select">
34
<h3><?php echo $this->__('Account Information') ?></h3>
35
<ul>
36
<li>
@@ -50,9 +50,11 @@
50
<?php if ($_taxvat->isEnabled()): ?>
51
<li><?php echo $_taxvat->setTaxvat($this->getCustomer()->getTaxvat())->toHtml() ?></li>
52
<?php endif ?>
53
</ul>
54
</fieldset>
55
- <p><input type="checkbox" name="change_password" id="change_password" value="1" onclick="setPasswordForm(this.checked)" title="<?php echo $this->__('Change Password') ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="change_password"><?php echo $this->__('Change Password') ?></label></p>
56
<fieldset class="group-select" style="display:none;">
57
<h3><?php echo $this->__('Change Password') ?></h3>
58
<ul>
29
</div>
30
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
32
<fieldset class="group-select">
33
+ <?php echo $this->getBlockHtml('formkey')?>
34
<h3><?php echo $this->__('Account Information') ?></h3>
35
<ul>
36
<li>
50
<?php if ($_taxvat->isEnabled()): ?>
51
<li><?php echo $_taxvat->setTaxvat($this->getCustomer()->getTaxvat())->toHtml() ?></li>
52
<?php endif ?>
53
+ <li>
54
+ <input type="checkbox" name="change_password" id="change_password" value="1" onclick="setPasswordForm(this.checked)" title="<?php echo $this->__('Change Password') ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="change_password"><?php echo $this->__('Change Password') ?></label>
55
+ </li>
56
</ul>
57
</fieldset>
58
<fieldset class="group-select" style="display:none;">
59
<h3><?php echo $this->__('Change Password') ?></h3>
60
<ul>
app/design/frontend/default/blank/template/customer/form/newsletter.phtml CHANGED
@@ -29,12 +29,14 @@
29
</div>
30
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
<form action="<?php echo $this->getAction() ?>" method="post" id="form-validate">
32
<?php echo $this->getBlockHtml('formkey')?>
33
<p><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo $this->__('General Subscription') ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="subscription"><?php echo $this->__('General Subscription') ?></label></p>
34
- <div class="buttons-set">
35
- <a href="<?php echo $this->getBackUrl() ?>" class="back-link">&laquo; <?php echo $this->__('Back') ?></a>
36
- <button type="submit" class="button"><span><?php echo $this->__('Save') ?></span></button>
37
- </div>
38
</form>
39
<script type="text/javascript">
40
//<![CDATA[
29
</div>
30
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
<form action="<?php echo $this->getAction() ?>" method="post" id="form-validate">
32
+ <fieldset>
33
<?php echo $this->getBlockHtml('formkey')?>
34
<p><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo $this->__('General Subscription') ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /> <label for="subscription"><?php echo $this->__('General Subscription') ?></label></p>
35
+ <div class="buttons-set">
36
+ <a href="<?php echo $this->getBackUrl() ?>" class="back-link">&laquo; <?php echo $this->__('Back') ?></a>
37
+ <button type="submit" class="button"><span><?php echo $this->__('Save') ?></span></button>
38
+ </div>
39
+ </fieldset>
40
</form>
41
<script type="text/javascript">
42
//<![CDATA[
app/design/frontend/default/blank/template/downloadable/catalog/product/links.phtml CHANGED
@@ -57,8 +57,10 @@
57
</span>
58
<?php if ($_isRequired): ?>
59
<script type="text/javascript">
60
$('links_<?php echo $_link->getId() ?>').advaiceContainer = 'links-advice-container';
61
$('links_<?php echo $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
62
</script>
63
<?php endif; ?>
64
</li>
@@ -71,6 +73,7 @@
71
</dd>
72
</dl>
73
<script type="text/javascript">
74
Product.Downloadable = Class.create();
75
Product.Downloadable.prototype = {
76
config : {},
@@ -107,5 +110,6 @@
107
}
108
109
var dConfig = new Product.Downloadable(<?php echo $this->getJsonConfig() ?>);
110
</script>
111
<?php endif;?>
57
</span>
58
<?php if ($_isRequired): ?>
59
<script type="text/javascript">
60
+ //<![CDATA[
61
$('links_<?php echo $_link->getId() ?>').advaiceContainer = 'links-advice-container';
62
$('links_<?php echo $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
63
+ //]]>
64
</script>
65
<?php endif; ?>
66
</li>
73
</dd>
74
</dl>
75
<script type="text/javascript">
76
+ //<![CDATA[
77
Product.Downloadable = Class.create();
78
Product.Downloadable.prototype = {
79
config : {},
110
}
111
112
var dConfig = new Product.Downloadable(<?php echo $this->getJsonConfig() ?>);
113
+ //]]>
114
</script>
115
<?php endif;?>
app/design/frontend/default/blank/template/downloadable/catalog/product/type.phtml CHANGED
@@ -18,28 +18,24 @@
18
* versions in the future. If you wish to customize Magento for your
19
* needs please refer to http://www.magentocommerce.com for more information.
20
*
21
- * @category design_default
22
* @package Mage
23
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
24
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
*/
26
27
-
28
/**
29
* Downloadable product type
30
*
31
* @see Mage_Downloadable_Block_Catalog_Product_View_Type
32
*/
33
?>
34
-
35
<?php $_product = $this->getProduct() ?>
36
37
<?php if($_product->isSaleable()): ?>
38
- <p class="availability"><?php echo $this->__('Availability: In stock.') ?></p>
39
<?php else: ?>
40
- <p class="availability"><?php echo $this->__('Availability: Out of stock.') ?></p>
41
<?php endif; ?>
42
-
43
<?php echo $this->getPriceHtml($_product) ?>
44
-
45
<?php echo $this->getChildHtml('samples') ?>
18
* versions in the future. If you wish to customize Magento for your
19
* needs please refer to http://www.magentocommerce.com for more information.
20
*
21
+ * @category design_blank
22
* @package Mage
23
* @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
24
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
*/
26
27
/**
28
* Downloadable product type
29
*
30
* @see Mage_Downloadable_Block_Catalog_Product_View_Type
31
*/
32
?>
33
<?php $_product = $this->getProduct() ?>
34
35
<?php if($_product->isSaleable()): ?>
36
+ <p class="availability"><?php echo $this->__('Availability') ?>: <span class="in-stock"><?php echo $this->__('In stock') ?></span></p>
37
<?php else: ?>
38
+ <p class="availability"><?php echo $this->__('Availability') ?>: <span class="out-of-stock"><?php echo $this->__('Out of stock') ?></span></p>
39
<?php endif; ?>
40
<?php echo $this->getPriceHtml($_product) ?>
41
<?php echo $this->getChildHtml('samples') ?>
app/design/frontend/default/blank/template/downloadable/checkout/cart/item/default.phtml CHANGED
@@ -26,7 +26,7 @@
26
?>
27
<?php $_item = $this->getItem()?>
28
<tr>
29
- <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" width="16" height="16" alt="<?php $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getProductUrl() ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" width="75" /></a></td>
31
<td class="attributes-col">
32
<h4 class="title"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h4>
@@ -52,7 +52,6 @@
52
<?php endif;?>
53
<!-- / -->
54
55
-
56
<!-- downloadable -->
57
<?php if ($links = $this->getLinks()): ?>
58
<dl class="item-options">
26
?>
27
<?php $_item = $this->getItem()?>
28
<tr>
29
+ <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>" alt="<?php echo $this->__('Remove item')?>"><img src="<?php echo $this->getSkinUrl('images/btn_trash.gif') ?>" alt="<?php echo $this->__('Remove item')?>" /></a></td>
30
<td><a href="<?php echo $this->getProductUrl() ?>"><img src="<?php echo $this->getProductThumbnail()->resize(75); ?>" alt="<?php echo $this->htmlEscape($this->getProductName()) ?>" width="75" /></a></td>
31
<td class="attributes-col">
32
<h4 class="title"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->getProductName() ?></a></h4>
52
<?php endif;?>
53
<!-- / -->
54
55
<!-- downloadable -->
56
<?php if ($links = $this->getLinks()): ?>
57
<dl class="item-options">
app/design/frontend/default/blank/template/downloadable/customer/products/list.phtml CHANGED
@@ -31,32 +31,39 @@
31
?>
32
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
<?php $_items = $this->getItems(); ?>
34
- <div class="page-head">
35
- <h3><?php echo Mage::helper('downloadable')->__('My Downloadable Products') ?></h3>
36
</div>
37
<?php echo $this->getChildHtml('pager'); ?>
38
- <table cellspacing="0" class="data-table" id="my-downloadable-products-table">
39
- <thead>
40
- <tr>
41
- <th><?php echo Mage::helper('downloadable')->__('Order #') ?></th>
42
- <th><?php echo Mage::helper('downloadable')->__('Date') ?></th>
43
- <th><?php echo Mage::helper('downloadable')->__('Title') ?></th>
44
- <th><?php echo Mage::helper('downloadable')->__('Status') ?></th>
45
- <th><?php echo Mage::helper('downloadable')->__('Remaining Downloads') ?></th>
46
- </tr>
47
- </thead>
48
- <tbody>
49
- <?php $_odd = ''; ?>
50
- <?php foreach ($_items as $_item): ?>
51
<tr>
52
- <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('downloadable')->__('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
53
- <td><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
54
- <td><?php echo $_item->getPurchased()->getProductName() ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('downloadable')->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $_item->getLinkTitle() ?></a></td>
55
- <td><em><?php echo ucfirst($_item->getStatus()) ?></em></td>
56
- <td><?php echo $this->getRemainingDownloads($_item) ?></td>
57
</tr>
58
- <?php endforeach; ?>
59
- </tbody>
60
- </table>
61
- <script type="text/javascript">decorateTable('my-downloadable-products-table')</script>
62
<?php echo $this->getChildHtml('pager'); ?>
31
?>
32
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
33
<?php $_items = $this->getItems(); ?>
34
+ <div class="page-title">
35
+ <h2><?php echo Mage::helper('downloadable')->__('My Downloadable Products') ?></h2>
36
</div>
37
<?php echo $this->getChildHtml('pager'); ?>
38
+ <?php if(count($_items)): ?>
39
+ <table cellspacing="0" class="data-table" id="my-downloadable-products-table">
40
+ <thead>
41
<tr>
42
+ <th><?php echo Mage::helper('downloadable')->__('Order #') ?></th>
43
+ <th><?php echo Mage::helper('downloadable')->__('Date') ?></th>
44
+ <th><?php echo Mage::helper('downloadable')->__('Title') ?></th>
45
+ <th><?php echo Mage::helper('downloadable')->__('Status') ?></th>
46
+ <th><?php echo Mage::helper('downloadable')->__('Remaining Downloads') ?></th>
47
</tr>
48
+ </thead>
49
+ <tbody>
50
+ <?php $_odd = ''; ?>
51
+ <?php foreach ($_items as $_item): ?>
52
+ <tr>
53
+ <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo Mage::helper('downloadable')->__('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
54
+ <td><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
55
+ <td><?php echo $_item->getPurchased()->getProductName() ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo Mage::helper('downloadable')->__('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $_item->getLinkTitle() ?></a></td>
56
+ <td><em><?php echo ucfirst($_item->getStatus()) ?></em></td>
57
+ <td><?php echo $this->getRemainingDownloads($_item) ?></td>
58
+ </tr>
59
+ <?php endforeach; ?>
60
+ </tbody>
61
+ </table>
62
+ <script type="text/javascript">decorateTable('my-downloadable-products-table')</script>
63
+ <?php else: ?>
64
+ <p><?php echo Mage::helper('downloadable')->__('You have no Downloadable Products.'); ?></p>
65
+ <?php endif; ?>
66
<?php echo $this->getChildHtml('pager'); ?>
67
+ <div class="buttons-set">
68
+ <a href="<?php echo $this->getBackUrl() ?>" class="back-link">&laquo; <?php echo $this->__('Back') ?></a>
69
+ </div>
app/design/frontend/default/blank/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml CHANGED
@@ -58,7 +58,6 @@
58
<?php foreach ($links->getPurchasedItems() as $link): ?>
59
<dd><?php echo $link->getLinkTitle() ?></dd>
60
<?php endforeach; ?>
61
- </dt>
62
</dl>
63
<?php endif; ?>
64
<!-- EOF downloadable -->
58
<?php foreach ($links->getPurchasedItems() as $link): ?>
59
<dd><?php echo $link->getLinkTitle() ?></dd>
60
<?php endforeach; ?>
61
</dl>
62
<?php endif; ?>
63
<!-- EOF downloadable -->
app/design/frontend/default/blank/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml CHANGED
@@ -59,7 +59,6 @@
59
<?php foreach ($links->getPurchasedItems() as $link): ?>
60
<dd><?php echo $link->getLinkTitle() ?></dd>
61
<?php endforeach; ?>
62
- </dt>
63
</dl>
64
<?php endif; ?>
65
<!-- EOF downloadable -->
59
<?php foreach ($links->getPurchasedItems() as $link): ?>
60
<dd><?php echo $link->getLinkTitle() ?></dd>
61
<?php endforeach; ?>
62
</dl>
63
<?php endif; ?>
64
<!-- EOF downloadable -->
app/design/frontend/default/blank/template/downloadable/sales/order/items/renderer.phtml DELETED
@@ -1,130 +0,0 @@
1
- <?php
2
- /**
3
- * Magento
4
- *
5
- * NOTICE OF LICENSE
6
- *
7
- * This source file is subject to the Academic Free License (AFL 3.0)
8
- * that is bundled with this package in the file LICENSE_AFL.txt.
9
- * It is also available through the world-wide-web at this URL:
10
- * http://opensource.org/licenses/afl-3.0.php
11
- * If you did not receive a copy of the license and are unable to
12
- * obtain it through the world-wide-web, please send an email
13
- * to license@magentocommerce.com so we can send you a copy immediately.
14
- *
15
- * DISCLAIMER
16
- *
17
- * Do not edit or add to this file if you wish to upgrade Magento to newer
18
- * versions in the future. If you wish to customize Magento for your
19
- * needs please refer to http://www.magentocommerce.com for more information.
20
- *
21
- * @category design_default
22
- * @package Mage_Downloadable
23
- * @copyright Copyright (c) 2008 Irubin Consulting Inc. DBA Varien (http://www.varien.com)
24
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25
- */
26
- ?>
27
- <?php $_item = $this->getItem() ?>
28
- <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29
- <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
30
- <?php if($_options = $this->getItemOptions()): ?>
31
- <dl class="item-options">
32
- <?php foreach ($_options as $_option) : ?>
33
- <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
34
- <?php if (!$this->getPrintStatus()): ?>
35
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option['value']) ?>
36
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
37
- <?php echo $_formatedOptionValue['value'] ?>
38
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
39
- <div class="truncated_full_value">
40
- <dl class="item-options">
41
- <dt><?php echo $this->htmlEscape($_option['label']) ?></dt>
42
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
43
- </dl>
44
- </div>
45
- <?php endif; ?>
46
- </dd>
47
- <?php else: ?>
48
- <dd><?php echo $this->htmlEscape($_option['value']) ?></dd>
49
- <?php endif; ?>
50
- <?php endforeach; ?>
51
- </dl>
52
- <?php endif; ?>
53
-
54
- <!-- downloadable -->
55
- <dl class="item-options">
56
- <dt>Links</dt>
57
- <dd>Track #1</dd>
58
- <dd>Track #2</dd>
59
- <dd>Track #3</dd>
60
- </dt>
61
- </dl>
62
- <!-- EOF downloadable -->
63
-
64
- <?php echo $_item->getDescription() ?>
65
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
66
- <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
67
- <?php endif; ?>
68
- </td>
69
- <td><?php echo Mage::helper('core/string')->splitInjection($this->getSku()) ?></td>
70
- <td class="a-right nowrap">
71
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
72
- <span class="price-excl-tax">
73
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
74
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
75
- <?php endif; ?>
76
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
77
- </span>
78
- <?php endif; ?>
79
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
80
- <span class="price-incl-tax">
81
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
82
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
83
- <?php endif; ?>
84
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getPriceInclTax($this->getItem())); ?>
85
- </span>
86
- <?php endif; ?>
87
- </td>
88
- <td class="a-right nowrap">
89
- <span class="nobr">
90
- <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
91
- <?php echo $this->__('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
92
- <?php endif; ?>
93
- <?php if ($this->getItem()->getQtyShipped() > 0): ?>
94
- <?php echo $this->__('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
95
- <?php endif; ?>
96
- <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
97
- <?php echo $this->__('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
98
- <?php endif; ?>
99
- <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
100
- <?php echo $this->__('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
101
- <?php endif; ?>
102
- </span>
103
- </td>
104
- <td class="a-right nowrap">
105
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
106
- <span class="price-excl-tax">
107
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
108
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
109
- <?php endif; ?>
110
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
111
- </span>
112
- <?php endif; ?>
113
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
114
- <span class="price-incl-tax">
115
- <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
116
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
117
- <?php endif; ?>
118
- <?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?>
119
- </span>
120
- <?php endif; ?>
121
- </td>
122
- <!--
123
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
124
- <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
125
- <?php endif; ?>
126
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
127
- <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?></th>
128
- <?php endif; ?>
129
- -->
130
- </tr>
app/design/frontend/default/blank/template/downloadable/sales/order/items/renderer/downloadable.phtml CHANGED
@@ -26,7 +26,7 @@
26
?>
27
<?php $_item = $this->getItem() ?>
28
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29
- <td><h5 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
30
<?php if($_options = $this->getItemOptions()): ?>
31
<dl class="item-options">
32
<?php foreach ($_options as $_option) : ?>
@@ -58,7 +58,6 @@
58
<?php foreach ($links->getPurchasedItems() as $link): ?>
59
<dd><?php echo $link->getLinkTitle() ?></dd>
60
<?php endforeach; ?>
61
- </dt>
62
</dl>
63
<?php endif; ?>
64
<!-- EOF downloadable -->
26
?>
27
<?php $_item = $this->getItem() ?>
28
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
29
+ <td><h4 class="title"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
30
<?php if($_options = $this->getItemOptions()): ?>
31
<dl class="item-options">
32
<?php foreach ($_options as $_option) : ?>
58
<?php foreach ($links->getPurchasedItems() as $link): ?>
59
<dd><?php echo $link->getLinkTitle() ?></dd>
60
<?php endforeach; ?>
61
</dl>
62
<?php endif; ?>
63
<!-- EOF downloadable -->
app/design/frontend/default/blank/template/page/switch/stores.phtml CHANGED
@@ -33,7 +33,7 @@
33
?>
34
<?php if(count($this->getGroups())>1): ?>
35
<fieldset class="store-switcher">
36
- <label for="select-store"><?php echo $this->__('Select Store') ?>: </label>
37
<select id="select-store" onchange="location.href=this.value">
38
<?php /*foreach ($this->getStores() as $_store): ?>
39
<option value="<?php echo $_store->getUrl('') ?>"<?php if($_store->getId()==$this->getCurrentStoreId()): ?> selected="selected"<?php endif; ?>><?php echo $_store->getName() ?></option>
33
?>
34
<?php if(count($this->getGroups())>1): ?>
35
<fieldset class="store-switcher">
36
+ <label for="select-store"><?php echo $this->__('Select Store') ?>:</label>
37
<select id="select-store" onchange="location.href=this.value">
38
<?php /*foreach ($this->getStores() as $_store): ?>
39
<option value="<?php echo $_store->getUrl('') ?>"<?php if($_store->getId()==$this->getCurrentStoreId()): ?> selected="selected"<?php endif; ?>><?php echo $_store->getName() ?></option>
app/design/frontend/default/blank/template/page/template/links.phtml CHANGED
@@ -31,7 +31,7 @@
31
?>
32
<?php $_links = $this->getLinks(); ?>
33
<?php if(count($_links)>0): ?>
34
- <ul class="links"<?php if($this->getName()): ?>):?> id="<?php echo $this->getName() ?>"<?php endif;?>>
35
<?php foreach($_links as $_link): ?>
36
<li<?php if($_link->getIsFirst()): ?> class="first"<?php elseif($_link->getIsLast()): ?> class="last"<?php endif; ?><?php echo $_link->getLiParams() ?>><?php echo $_link->getBeforeText() ?><a href="<?php echo $_link->getUrl() ?>" title="<?php echo $_link->getTitle() ?>" <?php echo $_link->getAParams() ?>><?php echo $_link->getLabel() ?></a><?php echo $_link->getAfterText() ?></li>
37
<?php endforeach; ?>
31
?>
32
<?php $_links = $this->getLinks(); ?>
33
<?php if(count($_links)>0): ?>
34
+ <ul class="links"<?php if($this->getName()): ?> id="<?php echo $this->getName() ?>"<?php endif;?>>
35
<?php foreach($_links as $_link): ?>
36
<li<?php if($_link->getIsFirst()): ?> class="first"<?php elseif($_link->getIsLast()): ?> class="last"<?php endif; ?><?php echo $_link->getLiParams() ?>><?php echo $_link->getBeforeText() ?><a href="<?php echo $_link->getUrl() ?>" title="<?php echo $_link->getTitle() ?>" <?php echo $_link->getAParams() ?>><?php echo $_link->getLabel() ?></a><?php echo $_link->getAfterText() ?></li>
37
<?php endforeach; ?>
app/design/frontend/default/blank/template/paypal/express/review.phtml CHANGED
@@ -28,91 +28,89 @@
28
<h2><?php echo $this->__('Review Order') ?></h2>
29
</div>
30
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
- <div class="block">
32
- <h3><?php echo $this->__('Shipping Information') ?></h3>
33
- <div class="col2-set">
34
- <div class="col-1">
35
- <h4><?php echo $this->__('Shipping Address') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('paypal/express/edit') ?>"><?php echo $this->__('Change Shipping Address') ?></a></h4>
36
- <address>
37
- <?php echo $this->getShippingAddress()->getFormated(true) ?>
38
- </address>
39
- </div>
40
- <div class="col-2">
41
- <h4><?php echo $this->__('Shipping Method') ?></h4>
42
- <?php if ($this->isVirtual()): ?>
43
- <strong><?php echo $this->__('No shipping method required.') ?></strong>
44
- <?php else: ?>
45
- <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
46
- <p><strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong></p>
47
- <?php else: ?>
48
-
49
- <form method="post" action="<?php echo $this->getUrl('paypal/express/saveShippingMethod') ?>">
50
- <select name="shipping_method" id="shipping_method" style="width:250px;" onchange="saveShippingMethod(this.value)">
51
- <?php if(!$this->getAddressShippingMethod()): ?>
52
- <option value=""><?php echo $this->__('Please select a shipping method...') ?></option>
53
- <?php endif ?>
54
- <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
55
- <optgroup label="<?php echo $this->getCarrierName($code) ?>" style="font-style:normal;">
56
- <?php foreach ($_rates as $_rate): ?>
57
- <?php if ($_rate->getErrorMessage()): ?>
58
- <option value="">
59
- <?php echo $_rate->getErrorMessage() ?>
60
- </option>
61
- <?php else: ?>
62
- <option value="<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()): ?> selected="selected"<?php endif ?> style="margin-left:16px;">
63
- <?php echo $_rate->getMethodTitle() ?> -
64
65
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
66
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
67
68
- <?php echo $_excl; ?>
69
- <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
70
- (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
71
- <?php endif; ?>
72
- </option>
73
- <?php endif ?>
74
- <?php endforeach; ?>
75
- </optgroup>
76
- <?php endforeach; ?>
77
- </select>
78
- <p class="actions">
79
- <button id="update_shipping_method" class="button" type="submit"><span><?php echo $this->__('Update Shipping Method') ?></span></button>
80
- </p>
81
- </form>
82
83
- <?php endif; ?>
84
- <?php endif; ?>
85
86
- </div>
87
- </div>
88
- </div>
89
90
- <div class="block">
91
- <h3><?php echo $this->__('Billing Information') ?></h3>
92
- <h4><?php echo $this->__('Payment Method') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('paypal/express/edit') ?>"><?php echo $this->__('Change Payment Method') ?></a></h4>
93
- <p><?php echo $this->__('PayPal Account') ?><br />
94
- <?php echo $this->getBillingAddress()->getEmail() ?></p>
95
</div>
96
97
- <h3><?php echo $this->__('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Shopping Cart') ?></a></h3>
98
99
- <div id='details-reload'>
100
- <?php echo $this->getChildHtml('details') ?>
101
- </div>
102
- <script type="text/javascript">decorateTable('details-table')</script>
103
104
- <br />
105
106
- <form method="post" action="<?php echo $this->getUrl('paypal/express/saveOrder') ?>">
107
- <fieldset>
108
- <span id="review-buttons-container">
109
- <button type="submit" class="button" id="review-button" onclick="return saveOrder();" value="<?php echo $this->__('Place an Order') ?>"><span><?php echo $this->__('Place an Order') ?></span></button>
110
- </span>
111
- <span id="review-please-wait" class="please-wait" style="display:none;">
112
- <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
113
- </span>
114
- </fieldset>
115
- </form>
116
<script type="text/javascript">
117
//<![CDATA[
118
if ($('update_shipping_method')) {
28
<h2><?php echo $this->__('Review Order') ?></h2>
29
</div>
30
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
+ <h3><?php echo $this->__('Shipping Information') ?></h3>
32
+ <div class="col2-set">
33
+ <div class="col-1">
34
+ <h4><?php echo $this->__('Shipping Address') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('paypal/express/edit') ?>"><?php echo $this->__('Change Shipping Address') ?></a></h4>
35
+ <address>
36
+ <?php echo $this->getShippingAddress()->getFormated(true) ?>
37
+ </address>
38
+ </div>
39
+ <div class="col-2">
40
+ <h4><?php echo $this->__('Shipping Method') ?></h4>
41
+ <?php if ($this->isVirtual()): ?>
42
+ <strong><?php echo $this->__('No shipping method required.') ?></strong>
43
+ <?php else: ?>
44
+ <?php if (!($_shippingRateGroups = $this->getShippingRates())): ?>
45
+ <p><strong><?php echo $this->__('Sorry, no quotes are available for this order at this time.') ?></strong></p>
46
+ <?php else: ?>
47
48
+ <form method="post" action="<?php echo $this->getUrl('paypal/express/saveShippingMethod') ?>">
49
+ <select name="shipping_method" id="shipping_method" style="width:250px;" onchange="saveShippingMethod(this.value)">
50
+ <?php if(!$this->getAddressShippingMethod()): ?>
51
+ <option value=""><?php echo $this->__('Please select a shipping method...') ?></option>
52
+ <?php endif ?>
53
+ <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
54
+ <optgroup label="<?php echo $this->getCarrierName($code) ?>" style="font-style:normal;">
55
+ <?php foreach ($_rates as $_rate): ?>
56
+ <?php if ($_rate->getErrorMessage()): ?>
57
+ <option value="">
58
+ <?php echo $_rate->getErrorMessage() ?>
59
+ </option>
60
+ <?php else: ?>
61
+ <option value="<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()): ?> selected="selected"<?php endif ?> style="margin-left:16px;">
62
+ <?php echo $_rate->getMethodTitle() ?> -
63
64
+ <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('tax')->displayShippingPriceIncludingTax()); ?>
65
+ <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
66
67
+ <?php echo $_excl; ?>
68
+ <?php if ($this->helper('tax')->displayShippingBothPrices() && $_incl != $_excl): ?>
69
+ (<?php echo $this->__('Incl. Tax'); ?> <?php echo $_incl; ?>)
70
+ <?php endif; ?>
71
+ </option>
72
+ <?php endif ?>
73
+ <?php endforeach; ?>
74
+ </optgroup>
75
+ <?php endforeach; ?>
76
+ </select>
77
+ <p class="actions">
78
+ <button id="update_shipping_method" class="button" type="submit"><span><?php echo $this->__('Update Shipping Method') ?></span></button>
79
+ </p>
80
+ </form>
81
82
+ <?php endif; ?>
83
+ <?php endif; ?>
84
85
</div>
86
+ </div>
87
88
+ <br />
89
90
+ <h3><?php echo $this->__('Billing Information') ?></h3>
91
+ <h4><?php echo $this->__('Payment Method') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('paypal/express/edit') ?>"><?php echo $this->__('Change Payment Method') ?></a></h4>
92
+ <p><?php echo $this->__('PayPal Account') ?></p>
93
+ <address><?php echo $this->getBillingAddress()->getEmail() ?></address>
94
+
95
+ <h3><?php echo $this->__('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo $this->__('Edit Shopping Cart') ?></a></h3>
96
+
97
+ <div id="details-reload">
98
+ <?php echo $this->getChildHtml('details') ?>
99
+ </div>
100
+ <script type="text/javascript">decorateTable('details-table')</script>
101
102
+ <br />
103
104
+ <form method="post" action="<?php echo $this->getUrl('paypal/express/saveOrder') ?>">
105
+ <fieldset>
106
+ <span id="review-buttons-container">
107
+ <button type="submit" class="button" id="review-button" onclick="return saveOrder();" value="<?php echo $this->__('Place an Order') ?>"><span><?php echo $this->__('Place an Order') ?></span></button>
108
+ </span>
109
+ <span id="review-please-wait" class="please-wait" style="display:none;">
110
+ <img src="<?php echo $this->getSkinUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo $this->__('Submitting order information...') ?>
111
+ </span>
112
+ </fieldset>
113
+ </form>
114
<script type="text/javascript">
115
//<![CDATA[
116
if ($('update_shipping_method')) {
app/design/frontend/default/blank/template/paypal/express/review/details.phtml CHANGED
@@ -40,7 +40,7 @@
40
<tfoot>
41
<?php foreach ($this->getTotals() as $_total): ?>
42
<tr>
43
- <th colspan="3"><?php echo $_total->getTitle() ?></th>
44
<td><?php echo $this->helper('checkout')->formatPrice($_total->getValue()) ?></td>
45
</tr>
46
<?php endforeach; ?>
40
<tfoot>
41
<?php foreach ($this->getTotals() as $_total): ?>
42
<tr>
43
+ <th colspan="3" class="a-right"><?php echo $_total->getTitle() ?></th>
44
<td><?php echo $this->helper('checkout')->formatPrice($_total->getValue()) ?></td>
45
</tr>
46
<?php endforeach; ?>
app/design/frontend/default/blank/template/sales/order/creditmemo/items.phtml CHANGED
@@ -25,13 +25,11 @@
25
*/
26
?>
27
<?php $_order = $this->getOrder() ?>
28
- <p><a href="<?php echo $this->getPrintAllCreditmemosUrl($_order) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print All Refunds') ?></a></p>
29
<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
30
- <div class="page-title">
31
- <h2><?php echo $this->__('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?></h2>
32
- <a href="<?php echo $this->getPrintCreditmemoUrl($_creditmemo) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print Refund') ?></a>
33
- </div>
34
- <h3><?php echo $this->__('Items Refunded') ?></h3>
35
<table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
36
<col />
37
<col width="20%" />
25
*/
26
?>
27
<?php $_order = $this->getOrder() ?>
28
+ <p class="a-right"><a href="<?php echo $this->getPrintAllCreditmemosUrl($_order) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print All Refunds') ?></a></p>
29
<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
30
+ <a href="<?php echo $this->getPrintCreditmemoUrl($_creditmemo) ?>" onclick="this.target='_blank'" class="f-right"><?php echo $this->__('Print Refund') ?></a>
31
+ <h3><?php echo $this->__('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?></h3>
32
+ <h4><?php echo $this->__('Items Refunded') ?></h4>
33
<table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
34
<col />
35
<col width="20%" />
app/design/frontend/default/blank/template/sales/order/creditmemo/items/renderer/default.phtml CHANGED
@@ -27,7 +27,7 @@
27
<?php $_item = $this->getItem() ?>
28
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
- <td><h4 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h4>
31
<?php if($_options = $this->getItemOptions()): ?>
32
<dl class="item-options">
33
<?php foreach ($_options as $_option) : ?>
@@ -60,43 +60,43 @@
60
<?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
61
<span class="price-excl-tax">
62
<?php if ($this->helper('tax')->displayCartBothPrices()): ?>
63
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
64
<div class="cart-price">
65
<?php endif; ?>
66
<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
67
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
68
</div>
69
<?php endif; ?>
70
<?php endif; ?>
71
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
72
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
73
<?php else: ?>
74
<div class="cart-price">
75
<?php endif; ?>
76
-
77
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
78
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
79
<?php else: ?>
80
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
81
<?php endif; ?>
82
-
83
</div>
84
-
85
-
86
<?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
87
-
88
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
89
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
90
<small>
91
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
92
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
93
<?php endforeach; ?>
94
</small>
95
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
96
<?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
97
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
98
<?php endforeach; ?>
99
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
100