Interface_Frontend_Blank - Version 1.2.1

Version Notes

1.2.1

Download this release

Release Info

Developer Magento Core Team
Extension Interface_Frontend_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/blank/default/layout/bundle.xml +1 -1
  2. app/design/frontend/blank/default/template/bundle/sales/order/creditmemo/items/renderer.phtml +94 -91
  3. app/design/frontend/blank/default/template/bundle/sales/order/invoice/items/renderer.phtml +58 -58
  4. app/design/frontend/blank/default/template/bundle/sales/order/items/renderer.phtml +57 -57
  5. app/design/frontend/blank/default/template/bundle/sales/order/shipment/items/renderer.phtml +1 -1
  6. app/design/frontend/blank/default/template/catalog/product/compare/sidebar.phtml +1 -1
  7. app/design/frontend/blank/default/template/catalog/product/list/related.phtml +1 -1
  8. app/design/frontend/blank/default/template/catalog/product/price.phtml +1 -1
  9. app/design/frontend/blank/default/template/catalog/product/view.phtml +1 -1
  10. app/design/frontend/blank/default/template/catalog/seo/sitemap.phtml +1 -1
  11. app/design/frontend/blank/default/template/catalogsearch/advanced/result.phtml +1 -1
  12. app/design/frontend/blank/default/template/checkout/cart/crosssell.phtml +1 -1
  13. app/design/frontend/blank/default/template/checkout/cart/item/default.phtml +1 -1
  14. app/design/frontend/blank/default/template/checkout/cart/render/default.phtml +1 -1
  15. app/design/frontend/blank/default/template/checkout/cart/render/simple.phtml +1 -1
  16. app/design/frontend/blank/default/template/checkout/cart/sidebar/default.phtml +1 -9
  17. app/design/frontend/blank/default/template/checkout/multishipping/addresses.phtml +1 -1
  18. app/design/frontend/blank/default/template/checkout/multishipping/billing.phtml +1 -1
  19. app/design/frontend/blank/default/template/checkout/onepage/review/info.phtml +3 -3
  20. app/design/frontend/blank/default/template/customer/address/edit.phtml +1 -1
  21. app/design/frontend/blank/default/template/customer/form/edit.phtml +4 -2
  22. app/design/frontend/blank/default/template/customer/form/newsletter.phtml +6 -4
  23. app/design/frontend/blank/default/template/downloadable/catalog/product/links.phtml +4 -0
  24. app/design/frontend/blank/default/template/downloadable/catalog/product/type.phtml +3 -7
  25. app/design/frontend/blank/default/template/downloadable/checkout/cart/item/default.phtml +1 -2
  26. app/design/frontend/blank/default/template/downloadable/customer/products/list.phtml +31 -24
  27. app/design/frontend/blank/default/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +0 -1
  28. app/design/frontend/blank/default/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +0 -1
  29. app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer.phtml +0 -130
  30. app/design/frontend/blank/default/template/downloadable/sales/order/items/renderer/downloadable.phtml +1 -2
  31. app/design/frontend/blank/default/template/page/switch/stores.phtml +1 -1
  32. app/design/frontend/blank/default/template/page/template/links.phtml +1 -1
  33. app/design/frontend/blank/default/template/paypal/express/review.phtml +73 -75
  34. app/design/frontend/blank/default/template/paypal/express/review/details.phtml +1 -1
  35. app/design/frontend/blank/default/template/sales/order/creditmemo/items.phtml +4 -6
  36. app/design/frontend/blank/default/template/sales/order/creditmemo/items/renderer/default.phtml +58 -58
  37. app/design/frontend/blank/default/template/sales/order/history.phtml +1 -1
  38. app/design/frontend/blank/default/template/sales/order/info.phtml +1 -1
  39. app/design/frontend/blank/default/template/sales/order/invoice/items.phtml +3 -5
  40. app/design/frontend/blank/default/template/sales/order/invoice/items/renderer/default.phtml +58 -58
  41. app/design/frontend/blank/default/template/sales/order/items/renderer/default.phtml +57 -57
  42. app/design/frontend/blank/default/template/sales/order/print.phtml +1 -1
  43. app/design/frontend/blank/default/template/sales/order/print/creditmemo.phtml +1 -1
  44. app/design/frontend/blank/default/template/sales/order/print/invoice.phtml +1 -1
  45. app/design/frontend/blank/default/template/sales/order/print/shipment.phtml +1 -1
  46. app/design/frontend/blank/default/template/sales/order/recent.phtml +1 -1
  47. app/design/frontend/blank/default/template/sales/order/shipment/items.phtml +7 -9
  48. app/design/frontend/blank/default/template/sales/order/shipment/items/renderer/default.phtml +1 -1
  49. app/design/frontend/blank/default/template/sales/order/view.phtml +1 -1
  50. app/design/frontend/blank/default/template/sales/reorder/sidebar.phtml +1 -1
  51. app/design/frontend/blank/default/template/shipping/tracking/popup.phtml +4 -2
  52. app/design/frontend/blank/default/template/wishlist/sharing.phtml +1 -1
  53. app/design/frontend/blank/default/template/wishlist/sidebar.phtml +1 -1
  54. package.xml +6 -6
  55. skin/frontend/blank/default/css/reset.css +1 -0
  56. skin/frontend/blank/default/css/styles-ie.css +2 -1
  57. skin/frontend/blank/default/css/styles.css +11 -2
app/design/frontend/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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/blank/default/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
  <small>
101
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
@@ -104,57 +104,57 @@
104
  </small>
105
  <?php endif; ?>
106
  </div>
107
-
108
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
110
  <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>
111
  </div>
112
  <?php endif; ?>
113
  <?php endif; ?>
114
  </span>
115
- <br /><br />
116
  <?php endif; ?>
117
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
118
  <span class="price-incl-tax">
119
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
120
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
  <div class="cart-price">
122
  <?php endif; ?>
123
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
124
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
  </div>
126
  <?php endif; ?>
127
  <?php endif; ?>
128
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
129
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
131
  <?php else: ?>
132
  <div class="cart-price">
133
  <?php endif; ?>
134
-
135
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
137
  <?php else: ?>
138
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
139
  <?php endif; ?>
140
-
141
  </div>
142
-
143
-
144
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
145
-
146
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
147
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
  <small>
149
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
150
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
151
  <?php endforeach; ?>
152
  </small>
153
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
156
  <?php endforeach; ?>
157
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
158
  <small>
159
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
160
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
@@ -162,8 +162,8 @@
162
  </small>
163
  <?php endif; ?>
164
  </div>
165
-
166
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
167
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
168
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
169
  </div>
@@ -177,43 +177,43 @@
177
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
178
  <span class="price-excl-tax">
179
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
180
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
181
  <div class="cart-price">
182
  <?php endif; ?>
183
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
184
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
185
  </div>
186
  <?php endif; ?>
187
  <?php endif; ?>
188
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
189
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
190
  <?php else: ?>
191
  <div class="cart-price">
192
  <?php endif; ?>
193
-
194
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
195
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
196
  <?php else: ?>
197
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
198
  <?php endif; ?>
199
-
200
  </div>
201
-
202
-
203
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
204
-
205
  <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
206
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
207
  <small>
208
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
209
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
210
  <?php endforeach; ?>
211
  </small>
212
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
213
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
214
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
215
  <?php endforeach; ?>
216
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
  <small>
218
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
219
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
@@ -221,56 +221,56 @@
221
  </small>
222
  <?php endif; ?>
223
  </div>
224
-
225
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
227
  <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>
228
  </div>
229
  <?php endif; ?>
230
  <?php endif; ?>
231
  </span>
232
- <br /><br />
233
  <?php endif; ?>
234
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
235
  <span class="price-incl-tax">
236
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
237
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
  <div class="cart-price">
239
  <?php endif; ?>
240
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
241
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
242
  </div>
243
  <?php endif; ?>
244
  <?php endif; ?>
245
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
246
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
247
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
248
  <?php else: ?>
249
  <div class="cart-price">
250
  <?php endif; ?>
251
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
252
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
253
  <?php else: ?>
254
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
255
  <?php endif; ?>
256
-
257
  </div>
258
-
259
-
260
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
261
-
262
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
263
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
264
  <small>
265
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
266
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
267
  <?php endforeach; ?>
268
  </small>
269
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
270
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
271
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
272
  <?php endforeach; ?>
273
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
274
  <small>
275
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
276
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
@@ -278,8 +278,8 @@
278
  </small>
279
  <?php endif; ?>
280
  </div>
281
-
282
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
283
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
284
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
285
  </div>
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><h5 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
31
  <?php if($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
  <?php foreach ($_options as $_option) : ?>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
68
  </div>
69
  <?php endif; ?>
70
  <?php endif; ?>
71
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$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') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
100
  <small>
101
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
104
  </small>
105
  <?php endif; ?>
106
  </div>
107
+
108
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
110
  <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>
111
  </div>
112
  <?php endif; ?>
113
  <?php endif; ?>
114
  </span>
115
+ <br />
116
  <?php endif; ?>
117
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
118
  <span class="price-incl-tax">
119
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
120
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
  <div class="cart-price">
122
  <?php endif; ?>
123
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
124
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
  </div>
126
  <?php endif; ?>
127
  <?php endif; ?>
128
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
129
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
131
  <?php else: ?>
132
  <div class="cart-price">
133
  <?php endif; ?>
134
+
135
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
137
  <?php else: ?>
138
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
139
  <?php endif; ?>
140
+
141
  </div>
142
+
143
+
144
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
145
+
146
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
147
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
  <small>
149
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
150
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
151
  <?php endforeach; ?>
152
  </small>
153
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
156
  <?php endforeach; ?>
157
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
158
  <small>
159
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
160
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
162
  </small>
163
  <?php endif; ?>
164
  </div>
165
+
166
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
167
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
168
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
169
  </div>
177
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
178
  <span class="price-excl-tax">
179
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
180
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
181
  <div class="cart-price">
182
  <?php endif; ?>
183
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
184
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
185
  </div>
186
  <?php endif; ?>
187
  <?php endif; ?>
188
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
189
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
190
  <?php else: ?>
191
  <div class="cart-price">
192
  <?php endif; ?>
193
+
194
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
195
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
196
  <?php else: ?>
197
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
198
  <?php endif; ?>
199
+
200
  </div>
201
+
202
+
203
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
204
+
205
  <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
206
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
207
  <small>
208
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
209
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
210
  <?php endforeach; ?>
211
  </small>
212
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
213
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
214
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
215
  <?php endforeach; ?>
216
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
  <small>
218
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
219
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
221
  </small>
222
  <?php endif; ?>
223
  </div>
224
+
225
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
227
  <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>
228
  </div>
229
  <?php endif; ?>
230
  <?php endif; ?>
231
  </span>
232
+ <br />
233
  <?php endif; ?>
234
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
235
  <span class="price-incl-tax">
236
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
237
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
  <div class="cart-price">
239
  <?php endif; ?>
240
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
241
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
242
  </div>
243
  <?php endif; ?>
244
  <?php endif; ?>
245
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
246
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
247
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
248
  <?php else: ?>
249
  <div class="cart-price">
250
  <?php endif; ?>
251
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
252
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
253
  <?php else: ?>
254
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
255
  <?php endif; ?>
256
+
257
  </div>
258
+
259
+
260
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
261
+
262
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
263
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
264
  <small>
265
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
266
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
267
  <?php endforeach; ?>
268
  </small>
269
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
270
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
271
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
272
  <?php endforeach; ?>
273
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
274
  <small>
275
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
276
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
278
  </small>
279
  <?php endif; ?>
280
  </div>
281
+
282
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
283
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
284
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
285
  </div>
app/design/frontend/blank/default/template/sales/order/history.phtml CHANGED
@@ -53,7 +53,7 @@
53
  <?php foreach ($_orders as $_order): ?>
54
  <tr>
55
  <td><?php echo $_order->getRealOrderId() ?></td>
56
- <td><?php echo $this->formatDate($_order->getCreatedAt()) ?></td>
57
  <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
58
  <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
59
  <td><em><?php echo $_order->getStatusLabel() ?></em></td>
53
  <?php foreach ($_orders as $_order): ?>
54
  <tr>
55
  <td><?php echo $_order->getRealOrderId() ?></td>
56
+ <td><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></td>
57
  <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
58
  <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
59
  <td><em><?php echo $_order->getStatusLabel() ?></em></td>
app/design/frontend/blank/default/template/sales/order/info.phtml CHANGED
@@ -54,7 +54,7 @@
54
  </ul>
55
  </dd>
56
  </dl>
57
- <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAt(), 'long')) ?></p>
58
  <?php if (!$_order->getIsVirtual()): ?>
59
  <div class="col2-set">
60
  <div class="col-1">
54
  </ul>
55
  </dd>
56
  </dl>
57
+ <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
58
  <?php if (!$_order->getIsVirtual()): ?>
59
  <div class="col2-set">
60
  <div class="col-1">
app/design/frontend/blank/default/template/sales/order/invoice/items.phtml CHANGED
@@ -25,12 +25,10 @@
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
- <p><a href="<?php echo $this->getPrintAllInvoicesUrl($_order) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print All Invoices') ?></a></p>
29
  <?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
30
- <div class="page-title">
31
- <h3><?php echo $this->__('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?></h3>
32
- <a href="<?php echo $this->getPrintInvoiceUrl($_invoice) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print Invoice') ?></a>
33
- </div>
34
  <h4><?php echo $this->__('Items Invoiced') ?></h4>
35
  <table cellspacing="0" class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
36
  <col />
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
+ <p class="a-right"><a href="<?php echo $this->getPrintAllInvoicesUrl($_order) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print All Invoices') ?></a></p>
29
  <?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
30
+ <a href="<?php echo $this->getPrintInvoiceUrl($_invoice) ?>" onclick="this.target='_blank'" class="f-right"><?php echo $this->__('Print Invoice') ?></a>
31
+ <h3><?php echo $this->__('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?></h3>
 
 
32
  <h4><?php echo $this->__('Items Invoiced') ?></h4>
33
  <table cellspacing="0" class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
34
  <col />
app/design/frontend/blank/default/template/sales/order/invoice/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) : ?>
@@ -61,43 +61,43 @@
61
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
62
  <span class="price-excl-tax">
63
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
64
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
65
  <div class="cart-price">
66
  <?php endif; ?>
67
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
68
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
69
  </div>
70
  <?php endif; ?>
71
  <?php endif; ?>
72
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
74
  <?php else: ?>
75
  <div class="cart-price">
76
  <?php endif; ?>
77
-
78
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
79
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
80
  <?php else: ?>
81
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
82
  <?php endif; ?>
83
-
84
  </div>
85
-
86
-
87
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
88
-
89
  <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
90
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
91
  <small>
92
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
93
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
94
  <?php endforeach; ?>
95
  </small>
96
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
97
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
98
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
99
  <?php endforeach; ?>
100
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
  <small>
102
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
103
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
@@ -105,57 +105,57 @@
105
  </small>
106
  <?php endif; ?>
107
  </div>
108
-
109
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
110
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
111
  <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>
112
  </div>
113
  <?php endif; ?>
114
  <?php endif; ?>
115
  </span>
116
- <br /><br />
117
  <?php endif; ?>
118
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
119
  <span class="price-incl-tax">
120
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
121
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
122
  <div class="cart-price">
123
  <?php endif; ?>
124
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
125
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
126
  </div>
127
  <?php endif; ?>
128
  <?php endif; ?>
129
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
130
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
131
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
132
  <?php else: ?>
133
  <div class="cart-price">
134
  <?php endif; ?>
135
-
136
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
137
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
138
  <?php else: ?>
139
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
140
  <?php endif; ?>
141
-
142
  </div>
143
-
144
-
145
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
146
-
147
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
148
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
  <small>
150
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
151
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
152
  <?php endforeach; ?>
153
  </small>
154
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
155
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
156
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
157
  <?php endforeach; ?>
158
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
159
  <small>
160
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
161
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
@@ -163,8 +163,8 @@
163
  </small>
164
  <?php endif; ?>
165
  </div>
166
-
167
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
168
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
169
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
170
  </div>
@@ -178,43 +178,43 @@
178
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
179
  <span class="price-excl-tax">
180
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
181
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
182
  <div class="cart-price">
183
  <?php endif; ?>
184
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
185
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
186
  </div>
187
  <?php endif; ?>
188
  <?php endif; ?>
189
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
190
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
191
  <?php else: ?>
192
  <div class="cart-price">
193
  <?php endif; ?>
194
-
195
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
196
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
197
  <?php else: ?>
198
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
199
  <?php endif; ?>
200
-
201
  </div>
202
-
203
-
204
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
205
-
206
  <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
207
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
208
  <small>
209
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
210
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
211
  <?php endforeach; ?>
212
  </small>
213
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
214
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
215
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
216
  <?php endforeach; ?>
217
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
218
  <small>
219
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
220
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
@@ -222,56 +222,56 @@
222
  </small>
223
  <?php endif; ?>
224
  </div>
225
-
226
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
227
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
228
  <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>
229
  </div>
230
  <?php endif; ?>
231
  <?php endif; ?>
232
  </span>
233
- <br /><br />
234
  <?php endif; ?>
235
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
236
  <span class="price-incl-tax">
237
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
238
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
239
  <div class="cart-price">
240
  <?php endif; ?>
241
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
242
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
  </div>
244
  <?php endif; ?>
245
  <?php endif; ?>
246
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
247
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
249
  <?php else: ?>
250
  <div class="cart-price">
251
  <?php endif; ?>
252
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
254
  <?php else: ?>
255
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
256
  <?php endif; ?>
257
-
258
  </div>
259
-
260
-
261
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
262
-
263
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
264
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
265
  <small>
266
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
267
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
268
  <?php endforeach; ?>
269
  </small>
270
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
271
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
272
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
273
  <?php endforeach; ?>
274
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
275
  <small>
276
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
277
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
@@ -279,8 +279,8 @@
279
  </small>
280
  <?php endif; ?>
281
  </div>
282
-
283
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
284
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
285
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
286
  </div>
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><h5 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
31
  <?php if($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
  <?php foreach ($_options as $_option) : ?>
61
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
62
  <span class="price-excl-tax">
63
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
64
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
65
  <div class="cart-price">
66
  <?php endif; ?>
67
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
68
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
69
  </div>
70
  <?php endif; ?>
71
  <?php endif; ?>
72
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
73
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
74
  <?php else: ?>
75
  <div class="cart-price">
76
  <?php endif; ?>
77
+
78
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
79
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
80
  <?php else: ?>
81
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
82
  <?php endif; ?>
83
+
84
  </div>
85
+
86
+
87
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
88
+
89
  <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
90
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
91
  <small>
92
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
93
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
94
  <?php endforeach; ?>
95
  </small>
96
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
97
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
98
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
99
  <?php endforeach; ?>
100
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
  <small>
102
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
103
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
105
  </small>
106
  <?php endif; ?>
107
  </div>
108
+
109
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
110
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
111
  <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>
112
  </div>
113
  <?php endif; ?>
114
  <?php endif; ?>
115
  </span>
116
+ <br />
117
  <?php endif; ?>
118
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
119
  <span class="price-incl-tax">
120
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
121
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
122
  <div class="cart-price">
123
  <?php endif; ?>
124
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
125
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
126
  </div>
127
  <?php endif; ?>
128
  <?php endif; ?>
129
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
130
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
131
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
132
  <?php else: ?>
133
  <div class="cart-price">
134
  <?php endif; ?>
135
+
136
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
137
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
138
  <?php else: ?>
139
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
140
  <?php endif; ?>
141
+
142
  </div>
143
+
144
+
145
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
146
+
147
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
148
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
  <small>
150
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
151
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
152
  <?php endforeach; ?>
153
  </small>
154
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
155
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
156
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
157
  <?php endforeach; ?>
158
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
159
  <small>
160
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
161
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
163
  </small>
164
  <?php endif; ?>
165
  </div>
166
+
167
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
168
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
169
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
170
  </div>
178
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
179
  <span class="price-excl-tax">
180
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
181
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
182
  <div class="cart-price">
183
  <?php endif; ?>
184
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
185
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
186
  </div>
187
  <?php endif; ?>
188
  <?php endif; ?>
189
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
190
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
191
  <?php else: ?>
192
  <div class="cart-price">
193
  <?php endif; ?>
194
+
195
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
196
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
197
  <?php else: ?>
198
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
199
  <?php endif; ?>
200
+
201
  </div>
202
+
203
+
204
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
205
+
206
  <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
207
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
208
  <small>
209
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
210
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
211
  <?php endforeach; ?>
212
  </small>
213
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
214
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
215
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
216
  <?php endforeach; ?>
217
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
218
  <small>
219
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
220
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
222
  </small>
223
  <?php endif; ?>
224
  </div>
225
+
226
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
227
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
228
  <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>
229
  </div>
230
  <?php endif; ?>
231
  <?php endif; ?>
232
  </span>
233
+ <br />
234
  <?php endif; ?>
235
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
236
  <span class="price-incl-tax">
237
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
238
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
239
  <div class="cart-price">
240
  <?php endif; ?>
241
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
242
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
  </div>
244
  <?php endif; ?>
245
  <?php endif; ?>
246
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
247
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
249
  <?php else: ?>
250
  <div class="cart-price">
251
  <?php endif; ?>
252
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
254
  <?php else: ?>
255
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
256
  <?php endif; ?>
257
+
258
  </div>
259
+
260
+
261
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
262
+
263
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
264
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
265
  <small>
266
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
267
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
268
  <?php endforeach; ?>
269
  </small>
270
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
271
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
272
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
273
  <?php endforeach; ?>
274
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
275
  <small>
276
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
277
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
279
  </small>
280
  <?php endif; ?>
281
  </div>
282
+
283
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
284
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
285
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
286
  </div>
app/design/frontend/blank/default/template/sales/order/items/renderer/default.phtml CHANGED
@@ -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
  <small>
101
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
@@ -104,57 +104,57 @@
104
  </small>
105
  <?php endif; ?>
106
  </div>
107
-
108
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
110
  <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>
111
  </div>
112
  <?php endif; ?>
113
  <?php endif; ?>
114
  </span>
115
- <br /><br />
116
  <?php endif; ?>
117
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
118
  <span class="price-incl-tax">
119
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
120
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
  <div class="cart-price">
122
  <?php endif; ?>
123
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
124
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
  </div>
126
  <?php endif; ?>
127
  <?php endif; ?>
128
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
129
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
131
  <?php else: ?>
132
  <div class="cart-price">
133
  <?php endif; ?>
134
-
135
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
137
  <?php else: ?>
138
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
139
  <?php endif; ?>
140
-
141
  </div>
142
-
143
-
144
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
145
-
146
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
147
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
  <small>
149
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
150
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
151
  <?php endforeach; ?>
152
  </small>
153
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
156
  <?php endforeach; ?>
157
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
158
  <small>
159
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
160
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
@@ -162,8 +162,8 @@
162
  </small>
163
  <?php endif; ?>
164
  </div>
165
-
166
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
167
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
168
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
169
  </div>
@@ -192,43 +192,43 @@
192
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
193
  <span class="price-excl-tax">
194
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
195
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
196
  <div class="cart-price">
197
  <?php endif; ?>
198
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
199
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
200
  </div>
201
  <?php endif; ?>
202
  <?php endif; ?>
203
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
204
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
205
  <?php else: ?>
206
  <div class="cart-price">
207
  <?php endif; ?>
208
-
209
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
210
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
211
  <?php else: ?>
212
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
213
  <?php endif; ?>
214
-
215
  </div>
216
-
217
-
218
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
219
-
220
  <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
221
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
222
  <small>
223
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
224
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
225
  <?php endforeach; ?>
226
  </small>
227
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
228
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
229
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
230
  <?php endforeach; ?>
231
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
232
  <small>
233
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
234
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
@@ -236,56 +236,56 @@
236
  </small>
237
  <?php endif; ?>
238
  </div>
239
-
240
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
241
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
242
  <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>
243
  </div>
244
  <?php endif; ?>
245
  <?php endif; ?>
246
  </span>
247
- <br /><br />
248
  <?php endif; ?>
249
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
250
  <span class="price-incl-tax">
251
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
252
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
  <div class="cart-price">
254
  <?php endif; ?>
255
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
256
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
  </div>
258
  <?php endif; ?>
259
  <?php endif; ?>
260
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
261
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
262
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
263
  <?php else: ?>
264
  <div class="cart-price">
265
  <?php endif; ?>
266
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
267
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
268
  <?php else: ?>
269
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
270
  <?php endif; ?>
271
-
272
  </div>
273
-
274
-
275
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
276
-
277
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
278
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
279
  <small>
280
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
281
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
282
  <?php endforeach; ?>
283
  </small>
284
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
286
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
287
  <?php endforeach; ?>
288
- <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
289
  <small>
290
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
291
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
@@ -293,8 +293,8 @@
293
  </small>
294
  <?php endif; ?>
295
  </div>
296
-
297
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && $this->getItem()->getWeeeTaxAppliedAmount()): ?>
298
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
299
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
300
  </div>
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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
68
  </div>
69
  <?php endif; ?>
70
  <?php endif; ?>
71
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$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') && (float)$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') && (float)$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') && (float)$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') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
100
  <small>
101
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
102
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
104
  </small>
105
  <?php endif; ?>
106
  </div>
107
+
108
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
110
  <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>
111
  </div>
112
  <?php endif; ?>
113
  <?php endif; ?>
114
  </span>
115
+ <br />
116
  <?php endif; ?>
117
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
118
  <span class="price-incl-tax">
119
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
120
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
  <div class="cart-price">
122
  <?php endif; ?>
123
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
124
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
  </div>
126
  <?php endif; ?>
127
  <?php endif; ?>
128
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
129
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
130
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
131
  <?php else: ?>
132
  <div class="cart-price">
133
  <?php endif; ?>
134
+
135
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
137
  <?php else: ?>
138
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
139
  <?php endif; ?>
140
+
141
  </div>
142
+
143
+
144
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
145
+
146
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
147
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
  <small>
149
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
150
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
151
  <?php endforeach; ?>
152
  </small>
153
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
155
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
156
  <?php endforeach; ?>
157
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
158
  <small>
159
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
160
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
162
  </small>
163
  <?php endif; ?>
164
  </div>
165
+
166
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
167
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
168
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
169
  </div>
192
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
193
  <span class="price-excl-tax">
194
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
195
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
196
  <div class="cart-price">
197
  <?php endif; ?>
198
  <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
199
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
200
  </div>
201
  <?php endif; ?>
202
  <?php endif; ?>
203
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
204
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
205
  <?php else: ?>
206
  <div class="cart-price">
207
  <?php endif; ?>
208
+
209
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
210
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
211
  <?php else: ?>
212
  <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
213
  <?php endif; ?>
214
+
215
  </div>
216
+
217
+
218
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
219
+
220
  <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
221
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
222
  <small>
223
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
224
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
225
  <?php endforeach; ?>
226
  </small>
227
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
228
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
229
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
230
  <?php endforeach; ?>
231
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
232
  <small>
233
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
234
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
236
  </small>
237
  <?php endif; ?>
238
  </div>
239
+
240
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
241
  <div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
242
  <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>
243
  </div>
244
  <?php endif; ?>
245
  <?php endif; ?>
246
  </span>
247
+ <br />
248
  <?php endif; ?>
249
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
250
  <span class="price-incl-tax">
251
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
252
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
  <div class="cart-price">
254
  <?php endif; ?>
255
  <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
256
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
  </div>
258
  <?php endif; ?>
259
  <?php endif; ?>
260
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
261
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
262
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
263
  <?php else: ?>
264
  <div class="cart-price">
265
  <?php endif; ?>
266
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
267
  <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
268
  <?php else: ?>
269
  <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
270
  <?php endif; ?>
271
+
272
  </div>
273
+
274
+
275
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
276
+
277
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display: none;">
278
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
279
  <small>
280
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
281
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
282
  <?php endforeach; ?>
283
  </small>
284
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
286
  <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
287
  <?php endforeach; ?>
288
+ <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
289
  <small>
290
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
291
  <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
293
  </small>
294
  <?php endif; ?>
295
  </div>
296
+
297
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
298
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
299
  <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
300
  </div>
app/design/frontend/blank/default/template/sales/order/print.phtml CHANGED
@@ -26,7 +26,7 @@
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
- <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAt(), 'long')) ?></p>
30
  <div class="col2-set">
31
  <?php if (!$_order->getIsVirtual()): ?>
32
  <div class="col-1">
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
+ <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
30
  <div class="col2-set">
31
  <?php if (!$_order->getIsVirtual()): ?>
32
  <div class="col-1">
app/design/frontend/blank/default/template/sales/order/print/creditmemo.phtml CHANGED
@@ -26,7 +26,7 @@
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
- <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAt(), 'long')) ?></p>
30
  <?php $_creditmemo = $this->getCreditmemo() ?>
31
  <?php if($_creditmemo): ?>
32
  <?php $_creditmemos = array($_creditmemo); ?>
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
+ <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
30
  <?php $_creditmemo = $this->getCreditmemo() ?>
31
  <?php if($_creditmemo): ?>
32
  <?php $_creditmemos = array($_creditmemo); ?>
app/design/frontend/blank/default/template/sales/order/print/invoice.phtml CHANGED
@@ -26,7 +26,7 @@
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
- <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAt(), 'long')) ?></p>
30
  <?php $_invoice = $this->getInvoice() ?>
31
  <?php if($_invoice): ?>
32
  <?php $_invoices = array($_invoice); ?>
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
+ <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
30
  <?php $_invoice = $this->getInvoice() ?>
31
  <?php if($_invoice): ?>
32
  <?php $_invoices = array($_invoice); ?>
app/design/frontend/blank/default/template/sales/order/print/shipment.phtml CHANGED
@@ -26,7 +26,7 @@
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
- <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAt(), 'long')) ?></p>
30
  <?php if (!$_order->getIsVirtual()): ?>
31
  <?php $_shipment = $this->getShipment() ?>
32
  <?php if($_shipment): ?>
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
  <h2><?php echo $this->__('Order #%s', $_order->getRealOrderId()) ?></h2>
29
+ <p><?php echo $this->__('Order Date: %s', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
30
  <?php if (!$_order->getIsVirtual()): ?>
31
  <?php $_shipment = $this->getShipment() ?>
32
  <?php if($_shipment): ?>
app/design/frontend/blank/default/template/sales/order/recent.phtml CHANGED
@@ -52,7 +52,7 @@
52
  <?php foreach ($_orders as $_order): ?>
53
  <tr>
54
  <td><?php echo $_order->getRealOrderId() ?></td>
55
- <td><?php echo $this->formatDate($_order->getCreatedAt()) ?> </td>
56
  <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
57
  <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
58
  <td><em><?php echo $_order->getStatusLabel() ?></em></td>
52
  <?php foreach ($_orders as $_order): ?>
53
  <tr>
54
  <td><?php echo $_order->getRealOrderId() ?></td>
55
+ <td><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?> </td>
56
  <td><?php echo $_order->getShippingAddress() ? $this->htmlEscape($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
57
  <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
58
  <td><em><?php echo $_order->getStatusLabel() ?></em></td>
app/design/frontend/blank/default/template/sales/order/shipment/items.phtml CHANGED
@@ -25,17 +25,15 @@
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
28
- <?php if ($_order->getTracksCollection()->count()) : ?>
29
  <p class="a-right">
30
- <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopUpUrlByOrderId($_order->getId()) ?>','trackorder','width=800,height=600,left=50,top=50,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track all shipment(s)') ?>"><?php echo $this->__('Track all shipments') ?></a>
 
 
 
31
  </p>
32
- <?php endif; ?>
33
- <p class="a-right"><a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print All Shipments') ?></a></p>
34
  <?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
35
- <div class="page-title">
36
- <h2><?php echo $this->__('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?></h2>
37
- <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print Shipment') ?></a>
38
- </div>
39
  <?php $tracks = $_shipment->getTracksCollection(); ?>
40
  <?php if ($tracks->count()): ?>
41
  <table class="data-table">
@@ -63,7 +61,7 @@
63
  </tr>
64
  </table>
65
  <?php endif; ?>
66
- <h3><?php echo $this->__('Items Shipped') ?></h3>
67
  <table class="data-table" id="my-shipment-table-<?php echo $_shipment->getId(); ?>">
68
  <col />
69
  <col width="35%" />
25
  */
26
  ?>
27
  <?php $_order = $this->getOrder() ?>
 
28
  <p class="a-right">
29
+ <?php if ($_order->getTracksCollection()->count()) : ?>
30
+ <a href="#" onclick="popWin('<?php echo $this->helper('shipping')->getTrackingPopUpUrlByOrderId($_order->getId()) ?>','trackorder','width=800,height=600,left=50,top=50,resizable=yes,scrollbars=yes'); return false;" title="<?php echo $this->__('Track all shipment(s)') ?>"><?php echo $this->__('Track all shipments') ?></a> <span class="separator">|</span>
31
+ <?php endif; ?>
32
+ <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'"><?php echo $this->__('Print All Shipments') ?></a>
33
  </p>
 
 
34
  <?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
35
+ <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>" onclick="this.target='_blank'" class="f-right"><?php echo $this->__('Print Shipment') ?></a>
36
+ <h3><?php echo $this->__('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?></h3>
 
 
37
  <?php $tracks = $_shipment->getTracksCollection(); ?>
38
  <?php if ($tracks->count()): ?>
39
  <table class="data-table">
61
  </tr>
62
  </table>
63
  <?php endif; ?>
64
+ <h4><?php echo $this->__('Items Shipped') ?></h4>
65
  <table class="data-table" id="my-shipment-table-<?php echo $_shipment->getId(); ?>">
66
  <col />
67
  <col width="35%" />
app/design/frontend/blank/default/template/sales/order/shipment/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) : ?>
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><h5 class="product-name"><?php echo $this->htmlEscape($_item->getName()) ?></h5>
31
  <?php if($_options = $this->getItemOptions()): ?>
32
  <dl class="item-options">
33
  <?php foreach ($_options as $_option) : ?>
app/design/frontend/blank/default/template/sales/order/view.phtml CHANGED
@@ -76,7 +76,7 @@ function giftMessageToogle(giftMessageIdentifier)
76
  <h3><?php echo $this->__('About Your Order') ?></h3>
77
  <dl>
78
  <?php foreach ($_history as $_historyItem): ?>
79
- <dt><?php echo $this->formatDate($_historyItem->getCreatedAt(), 'medium', true) ?></dt>
80
  <dd><?php echo $_historyItem->getComment() ?></dd>
81
  <?php endforeach; ?>
82
  </dl>
76
  <h3><?php echo $this->__('About Your Order') ?></h3>
77
  <dl>
78
  <?php foreach ($_history as $_historyItem): ?>
79
+ <dt><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
80
  <dd><?php echo $_historyItem->getComment() ?></dd>
81
  <?php endforeach; ?>
82
  </dl>
app/design/frontend/blank/default/template/sales/reorder/sidebar.phtml CHANGED
@@ -34,7 +34,7 @@
34
  <?php if($_order = $this->getLastOrder()): ?>
35
  <div class="block block-reorder">
36
  <div class="block-title">
37
- <h2><?php echo $this->__('My Orders') ?> <span class="separator">|</span> <a href="<?php echo $this->getUrl('customer/account') ?>">View All</a></h2>
38
  </div>
39
  <div class="block-content">
40
  <h3><?php echo $this->__('Last ordered items') ?></h3>
34
  <?php if($_order = $this->getLastOrder()): ?>
35
  <div class="block block-reorder">
36
  <div class="block-title">
37
+ <h2><?php echo $this->__('My Orders') ?> <span class="separator">|</span> <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo $this->__('View All'); ?></a></h2>
38
  </div>
39
  <div class="block-content">
40
  <h3><?php echo $this->__('Last ordered items') ?></h3>
app/design/frontend/blank/default/template/shipping/tracking/popup.phtml CHANGED
@@ -135,10 +135,12 @@
135
  </tr>
136
  </thead>
137
  <?php foreach($track->getProgressdetail() as $_detail): ?>
 
 
138
  <tr>
139
  <td><?php echo (isset($_detail['deliverylocation']) ? $_detail['deliverylocation'] : ''); ?></td>
140
- <td><?php echo (isset($_detail['deliverydate']) ? $this->formatDeliveryDate($_detail['deliverydate']) : '') ?></td>
141
- <td><?php echo (isset($_detail['deliverytime']) ? $this->formatDeliveryTime($_detail['deliverytime']) : '') ?></td>
142
  <td><?php echo (isset($_detail['activity']) ? $_detail['activity'] : '') ?></td>
143
  </tr>
144
  <?php endforeach; ?>
135
  </tr>
136
  </thead>
137
  <?php foreach($track->getProgressdetail() as $_detail): ?>
138
+ <?php $_detailDate = (isset($_detail['deliverydate']) ? $this->formatDeliveryDate($_detail['deliverydate']) : '') ?>
139
+ <?php $_detailTime = (isset($_detail['deliverytime']) ? $this->formatDeliveryTime($_detail['deliverytime'], $_detailDate) : '') ?>
140
  <tr>
141
  <td><?php echo (isset($_detail['deliverylocation']) ? $_detail['deliverylocation'] : ''); ?></td>
142
+ <td><?php echo $_detailDate ?></td>
143
+ <td><?php echo $_detailTime ?></td>
144
  <td><?php echo (isset($_detail['activity']) ? $_detail['activity'] : '') ?></td>
145
  </tr>
146
  <?php endforeach; ?>
app/design/frontend/blank/default/template/wishlist/sharing.phtml CHANGED
@@ -29,8 +29,8 @@
29
  </div>
30
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
  <form action="<?php echo $this->getSendUrl() ?>" id="form-validate" method="post">
32
- <?php echo $this->getBlockHtml('formkey')?>
33
  <fieldset class="group-select">
 
34
  <h3><?php echo $this->__('Sharing Information') ?></h3>
35
  <ul class="form-list">
36
  <li>
29
  </div>
30
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
31
  <form action="<?php echo $this->getSendUrl() ?>" id="form-validate" method="post">
 
32
  <fieldset class="group-select">
33
+ <?php echo $this->getBlockHtml('formkey')?>
34
  <h3><?php echo $this->__('Sharing Information') ?></h3>
35
  <ul class="form-list">
36
  <li>
app/design/frontend/blank/default/template/wishlist/sidebar.phtml CHANGED
@@ -38,7 +38,7 @@
38
  <?php if($this->helper('wishlist')->getItemCount()>0): ?>
39
  <ol class="mini-products-list" id="wishlist-sidebar">
40
  <?php foreach($this->getWishlistItems() as $_item): ?>
41
- <li>
42
  <a href="<?php echo $_item->getProductUrl() ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(50); ?>" width="50" height="50" alt="<?php echo $this->htmlEscape($_item->getName()) ?>" title="<?php echo $this->htmlEscape($_item->getName()) ?>" /></a>
43
  <div class="product-details">
44
  <a href="<?php echo $this->helper('wishlist')->getRemoveUrl($_item) ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the wishlist?') ?>');" class="btn-remove"><img src="<?php echo $this->getSkinUrl('images/list_remove_btn.gif') ?>" alt="<?php echo $this->__('Remove Item') ?>" title="<?php echo $this->__('Remove Item') ?>" /></a>
38
  <?php if($this->helper('wishlist')->getItemCount()>0): ?>
39
  <ol class="mini-products-list" id="wishlist-sidebar">
40
  <?php foreach($this->getWishlistItems() as $_item): ?>
41
+ <li class="item">
42
  <a href="<?php echo $_item->getProductUrl() ?>" class="product-image"><img src="<?php echo $this->helper('catalog/image')->init($_item, 'thumbnail')->resize(50); ?>" width="50" height="50" alt="<?php echo $this->htmlEscape($_item->getName()) ?>" title="<?php echo $this->htmlEscape($_item->getName()) ?>" /></a>
43
  <div class="product-details">
44
  <a href="<?php echo $this->helper('wishlist')->getRemoveUrl($_item) ?>" onclick="return confirm('<?php echo $this->__('Are you sure you would like to remove this item from the wishlist?') ?>');" class="btn-remove"><img src="<?php echo $this->getSkinUrl('images/list_remove_btn.gif') ?>" alt="<?php echo $this->__('Remove Item') ?>" title="<?php echo $this->__('Remove Item') ?>" /></a>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Blank</name>
4
- <version>1.2.0.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL 3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>A clean simplistic design interface that can be easily customized by professional designers</summary>
10
  <description>A clean simplistic design interface that can be easily customized by professional designers</description>
11
- <notes>1.2.0.3</notes>
12
  <authors><author><name>Magento Core Team</name><user>auto-converted</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2009-01-23</date>
14
- <time>03:02:54</time>
15
- <contents><target name="mageskin"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="css"><file name="clears.css" hash="3d33e824e9fe88915a0f9f1e7f9c147d"/><file name="print.css" hash="1839347706087be0a9c2e3088e5f2f1d"/><file name="reset.css" hash="22db9066e96542f5895a31cca4a21269"/><file name="styles-ie.css" hash="e2039b3791e140d53320fb90ddce661f"/><file name="styles.css" hash="67d75fbec01b329b9d6ec2d173821a1c"/></dir><dir name="images"><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="media"><file name="404_callout1.jpg" hash="834e53a03e2921a2fd3c135c0c7189df"/><file name="404_callout2.jpg" hash="016984b4a1579df34147f9407098db73"/><file name="about_us_img.jpg" hash="726f36dd75b5a709a1a14acab1660188"/><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/></dir><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_rating.gif" hash="0a8777c815350ddf1e316a537ad0c335"/><file name="btn_google_checkout.gif" hash="843d75249ce05b5d87ca5419f37b1c3b"/><file name="btn_paypal_checkout.gif" hash="6edd61270b7b5632eafad10557129114"/><file name="btn_trash.gif" hash="bcb22f558a0eb32243a2a36645189e9f"/><file name="btn_window_close.gif" hash="c83f3cbbb2aedfc580dff78d5cfb63ed"/><file name="cvv.gif" hash="ed0f392004a405466291071a760b285d"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="icon_big_rss.png" hash="6cf70e7c52a3f3d7b833ccadb041a555"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_rss.gif" hash="e5bbc388d818c142868b4a1df0b48793"/><file name="list_remove_btn.gif" hash="6182e723aa2a253dc6cf334a3dfaaa84"/><file name="logo.gif" hash="6c1c8318d7dd57cc674f2f3cddf04344"/><file name="logo_email.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="logo_print.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="magnifier_handle.gif" hash="238fbdd7959f517db11c6f57ee4daaf4"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="pager_arrow_left.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="pager_arrow_right.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="slider_bg.gif" hash="87bc1b46d87de4f6252c7216216627c3"/><file name="slider_btn_zoom_in.gif" hash="ef0fc67f77f30827ee67f4e744b60781"/><file name="slider_btn_zoom_out.gif" hash="68b3d1c28dc5aec4f6b64d70a6996b6f"/><file name="sort_asc_arrow.gif" hash="40aa554212d6a1f60593c27d78d85fa3"/><file name="sort_desc_arrow.gif" hash="92fd194bfae4ce5ae3354e1e47d7ac7d"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir><dir name="js"><file name="bundle.js" hash="7fb06ec966f79c0488198975a69c6c0b"/><file name="giftmessage.js" hash="98f056ae92e10813f0d550daae6dd944"/><file name="opcheckout.js" hash="88c8105c1a196534fdb5ebc7f216cb8c"/><file name="paypal.js" hash="4793d611370033c7daec147f135672b5"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="layout"><file name="bundle.xml" hash="4f03691d578996e5241629877fb28b99"/><file name="catalog.xml" hash="359d90f692b67b46736c702be63c3506"/><file name="catalogsearch.xml" hash="b21a5126f8cff8c4da6c853c8163f769"/><file name="checkout.xml" hash="ee2b9f38a9dcc0d971a9204bce49cc36"/><file name="cms.xml" hash="9a4eb9fa95b1e217ab30a654e7423821"/><file name="contacts.xml" hash="e3e3eb3dcf2c276fa11d66722a0a1c62"/><file name="core.xml" hash="99c290a45fc882985b55279180d6a491"/><file name="customer.xml" hash="a180537185e2e90d25f3e7efa7298b35"/><file name="directory.xml" hash="eb1bb63ef64fc8283a69f13fd3f90005"/><file name="downloadable.xml" hash="a4bb31c7d838e10893fe2a54a7636592"/><file name="giftmessage.xml" hash="d91f058897e4ae05938b44960a87a7c0"/><file name="googleanalytics.xml" hash="72fd608e307339080bc2b0e28762644d"/><file name="googlecheckout.xml" hash="c24d4770dec193a19a72834beb1951df"/><file name="googleoptimizer.xml" hash="c8b25d432c8d2d1892834af7a3f35667"/><file name="newsletter.xml" hash="06e2fa151b7034cd74268684d2050309"/><file name="page.xml" hash="edc6889fc4f4f406b0501b4533b3f455"/><file name="paypal.xml" hash="53eed662b8f4486b6a0064ba480b92e4"/><file name="paypaluk.xml" hash="e1f0523007cc3d4b523b6be24fa4e950"/><file name="poll.xml" hash="3cd2707dc21722104fc344c3d342a4b9"/><file name="productalert.xml" hash="8760bb53020762f38f2b854840017a9b"/><file name="reports.xml" hash="5a5c702eb1447187f08191d1d9a5e03d"/><file name="review.xml" hash="45b1dd918723370021ca91570f1d80eb"/><file name="rss.xml" hash="fcad94b8d76d848a2f4f558db95327b5"/><file name="sales.xml" hash="b325c89f0069ecc6845eeb4bef0f41a1"/><file name="sendfriend.xml" hash="515511b04f660095caed35c617bbab28"/><file name="shipping.xml" hash="89377704115050fe38a219c4abcf7ec6"/><file name="tag.xml" hash="3b13589cc8a8231ce8a73ff3b6eb2c31"/><file name="wishlist.xml" hash="b4cda0f01fc23f3466c7692cc8fb9801"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="793e1ff86039f24caff6fad87a094fa1"/></dir></dir><dir name="template"><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="f0d5c55a57290a885664ea86e133b679"/></dir><dir name="view"><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="c4d2679d1daa39b510b50333e207c5f2"/><file name="multi.phtml" hash="7faa0e1b19d975d3638711aac4deb6d7"/><file name="radio.phtml" hash="0fe4a1916cd43b89f5e0681b2a095af9"/><file name="select.phtml" hash="cc85f0bccd13e65e65db247913e74382"/></dir><file name="options.phtml" hash="be546769aaa064f1340eff43e38066d3"/></dir><file name="bundle.phtml" hash="d0e59e1797172c8eb0f257059c43f50b"/></dir><file name="price.phtml" hash="5d61ae7dde0a2334c1e67c42412e03a9"/><file name="tierprices.phtml" hash="87c95796e53d19a9756c8e33df7eacfb"/></dir><file name="price.phtml" hash="e8a4ed53bcf630bf1fbc5dfdb8c4cac1"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4144bdfa26bc8c6bfef2b415c047b97d"/></dir><dir name="invoice"><file name="default.phtml" hash="ef20fe460ac338cf1716f36ca3b3281b"/></dir><dir name="order"><file name="default.phtml" hash="f0927ef4c5ad576690523804f086ba39"/></dir><dir name="shipment"><file name="default.phtml" hash="5d8cf3065959e86c2be887716bce3b6e"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="371c5b21820208ca436b7b0896251cb0"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="fc83ec6b4d194be4ca1a00d5d7ef3907"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="34b094f32fc1a7c8b238ab20a7300c9a"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="308fcef88836ad8a7c7a8c85bdf6662b"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="da32aafba925f37aeab347e4f93b1403"/><file name="right_col.phtml" hash="14e517ae3aeb65a1a5861dbb6aa81c1b"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="aadf8b6c6e7657d5987dc4fc8898f81a"/><file name="view.phtml" hash="68897ae0f611b891d1dd20dfb10a1630"/></dir><dir name="layer"><file name="filter.phtml" hash="ad88f40ef09460cc31f3cf3b8b132742"/><file name="state.phtml" hash="493c701dbb66786af9872a6137f5f10f"/><file name="view.phtml" hash="f42d2e546bedbf1d84b1bb8c8ccc1282"/></dir><dir name="navigation"><file name="left.phtml" hash="75bf0af3c058c16568263cf4938ed0d0"/><file name="top.phtml" hash="6a856216d0b08d3bed2b0f360597ace2"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="f71016df7f5cdfd7e915076192bd70ab"/><file name="sidebar.phtml" hash="8b04f65338a8553579cee53c9437854c"/></dir><dir name="list"><file name="related.phtml" hash="29bf56713108dd8feab826ff6b4816de"/><file name="toolbar.phtml" hash="c08d6d828a77c65ffc1b1dce63268aee"/><file name="upsell.phtml" hash="9ac23c3998f86d91341b81d88dd3aa5c"/></dir><dir name="view"><dir name="options"><dir name="type"><file name="date.phtml" hash="6e84105edec52c7ec566713dccefe87d"/><file name="default.phtml" hash="e164beb01b3077fa1bf9a9bbb341ad56"/><file name="file.phtml" hash="805652068a3cd4224e62ab946a1803b1"/><file name="select.phtml" hash="15d350c5944b75b93236c59f1ab70e86"/><file name="text.phtml" hash="5594a2889cd9cb7c7e784446205411ff"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="9be3658960ada4f4c774736829076538"/></dir><file name="wrapper.phtml" hash="c10ed9f230ecc827a1c2f99c9a4b4d46"/></dir><dir name="type"><dir name="options"><file name="configurable.phtml" hash="8eb194d7cef5bf44842c3380cbcd68ad"/></dir><file name="configurable.phtml" hash="9e3f4a6fb16ab3de753dae23796cde11"/><file name="grouped.phtml" hash="6b29550dd2f515dd37f84acf1f05f52b"/><file name="simple.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/><file name="virtual.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/></dir><file name="additional.phtml" hash="6fc511a523e1b3065765365aa194520a"/><file name="addto.phtml" hash="13630226d178b97229191ca9535c7457"/><file name="addtocart.phtml" hash="cc1091934b28ee93bac4ff7e8dda9d0b"/><file name="attributes.phtml" hash="e346dc81d9222db8f6c4e6415d21e47e"/><file name="description.phtml" hash="7e18c1608cb82f8a8c107e5568438e91"/><file name="media.phtml" hash="a7d10d0a7e3232d29fce64276c1d454b"/><file name="options.phtml" hash="a54bcbd166d4a07219aa3f5b6291afe8"/><file name="price.phtml" hash="6ad72e4f21ddeba52027a7faade0e7cd"/><file name="price_clone.phtml" hash="8b72619d07da2aa9c7c11c1017068731"/><file name="tierprices.phtml" hash="3ac2d5f5338c97a67f2e7a81e741295e"/></dir><file name="gallery.phtml" hash="dd58f98d6cf094f2cd024f9b4458af1f"/><file name="list.phtml" hash="271c7c8ad0d01d1299c8a65c1faea818"/><file name="new.phtml" hash="fe42f21177ccc9171a2126c8a7b1e232"/><file name="price.phtml" hash="a22ab6e67861dd45ed81759874595e84"/><file name="view.phtml" hash="f67cff47d239c34271a82d9e86ad3569"/></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="a952fcb12c6c8cd2f51313fa63dba74c"/></dir><file name="sitemap.phtml" hash="8906683fe0b04d0b3add51dcca7eb01c"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="8076150501f5051b8876212539e10f1f"/><file name="result.phtml" hash="ab507f43a3b2b94239bfddc16e187e72"/></dir><file name="form.mini.phtml" hash="71803ed517beaa1176e42ad9181651bb"/><file name="result.phtml" hash="07470604fb50e5a3b25432f49a206006"/><file name="term.phtml" hash="66ab2560641b0872c3211f3d8f42e33a"/></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="4f8c87c35dd871765b92d6042484b562"/></dir><dir name="render"><file name="default.phtml" hash="2671864bbfc5fd95ea3b4a5f25521b2b"/><file name="simple.phtml" hash="cc81d4edfa9865928fd819fe41a8c723"/></dir><dir name="sidebar"><file name="default.phtml" hash="f1cc0dde7d77bbe871af648c73449aab"/></dir><file name="coupon.phtml" hash="0f47b671f2f28ba2a9b317ca112a7475"/><file name="crosssell.phtml" hash="4f0d9f4b5e0090392c85f43e6afa6998"/><file name="noItems.phtml" hash="03f31b1e9168d12b3ba9dc2f8bd1f760"/><file name="shipping.phtml" hash="4476cd2fdb736eca745768aa68be853e"/><file name="sidebar.phtml" hash="7841d505317e5f6d5e0cde4a2a9f2c6b"/><file name="totals.phtml" hash="01b900fbbd994771ea04ed56c86339ec"/></dir><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="2b3c82fad5fcde0b9d02a141519dde69"/></dir><dir name="billing"><file name="items.phtml" hash="70f639ad42813a3da7cd32456d3a2845"/></dir><dir name="item"><file name="default.phtml" hash="bf3ff3612005dbd7dff5b538673a3db6"/></dir><file name="addresses.phtml" hash="44b2fdf4f089569d5039281962530547"/><file name="agreements.phtml" hash="0cc2c61890723b3c810f4165b0b6ea8e"/><file name="billing.phtml" hash="5ebdb4919e56eb58073f8d070b48fc6a"/><file name="link.phtml" hash="c4225a9a1bbd9f177199119209469b11"/><file name="overview.phtml" hash="efed56ad7b22899afb3f8bbaabf4cbe8"/><file name="shipping.phtml" hash="396208d67285f2fdc1e052cefa20379c"/><file name="state.phtml" hash="a82cbe78e6abfa201db2c2af4063aa94"/><file name="success.phtml" hash="176224e9774b28520d8b7e07d22db6ba"/></dir><dir name="onepage"><dir name="payment"><file name="methods.phtml" hash="513839214b355ac6f1ec879230459d05"/></dir><dir name="review"><file name="info.phtml" hash="ed0b1dca61696cd7244c414ee7875b23"/><file name="item.phtml" hash="f5f3ee3ad4430d94b09d5243875ae197"/><file name="totals.phtml" hash="63fb070ddef121951ed09f78641b17a4"/></dir><dir name="shipping_method"><file name="additional.phtml" hash="1f8a9204df1f5854c76ab9e729f1e191"/><file name="available.phtml" hash="b3794aa3ea6c16633292390b5e5100f0"/></dir><file name="agreements.phtml" hash="0527bfb427c60aa956791bcfc3aa2baa"/><file name="billing.phtml" hash="5207f18b54ed643ddcdbe96bee74466e"/><file name="failure.phtml" hash="5c6c4a68a56edbe050f084e441231f69"/><file name="link.phtml" hash="3ee2e026b7ca9f052db065b35ef6fcd7"/><file name="login.phtml" hash="8815aa7c39bc7133941f327dbfe64af2"/><file name="payment.phtml" hash="a4bbb98233c87128a91573e93f29fcf9"/><file name="progress.phtml" hash="44f9aed669a32f4edcff52760d283a6d"/><file name="review.phtml" hash="495f48bcc50ab3abd0efac683f4be4e1"/><file name="shipping.phtml" hash="66f34e6de976356c9e68e75967fc9b05"/><file name="shipping_method.phtml" hash="5f3d0140324ad1dca3901d14d0531277"/></dir><dir name="total"><file name="default.phtml" hash="4a680113802974e087a73b572129a11b"/><file name="tax.phtml" hash="445fd8fd4d463610f33014596a0871ba"/></dir><file name="cart.phtml" hash="c77bbb58780661aa0cd8eee498d00dd8"/><file name="links.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="onepage.phtml" hash="2ee5d54e33dfacb4f1cdd58ea12e12c1"/><file name="success.phtml" hash="dac0fd8f84f2607379eff82da2c8fb5c"/></dir><dir name="cms"><dir name="default"><file name="home.phtml" hash="cae87e8ece9b2cf11d56f58f78b61354"/><file name="no-route.phtml" hash="a82130a7e80d0f544fe904b1b8795a1b"/></dir><file name="content.phtml" hash="5bc7aa683ad79c7a422478c6cc67a963"/><file name="meta.phtml" hash="73c1b59cdc8e7ec40d294f3ac755005c"/></dir><dir name="contacts"><file name="form.phtml" hash="a48b4c5517e3ae407c9ceb89c24e249d"/></dir><dir name="core"><file name="formkey.phtml" hash="6f59eb9cc856f4f5b3ee30756300e2a6"/><file name="messages.phtml" hash="31f0e7850e552a1e67d8d99a5c0fbe1b"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="2a9ec75a331b2411809154b99bb7020e"/><file name="hello.phtml" hash="a3870656761e58365a6f19e105d340ec"/><file name="info.phtml" hash="737b388782a4ca8b58d9295fbed7f16b"/><file name="newsletter.phtml" hash="22d34e6401ff61b26e48de0a7052bbd1"/><file name="sidebar.phtml" hash="affc0973c249464f98d6592ce4a52538"/></dir><dir name="link"><file name="back.phtml" hash="c0a1831d7f2926c3499fb9bbc2d519d5"/></dir><file name="dashboard.phtml" hash="116bef22699a11e2433fbc44ccdb87f7"/><file name="navigation.phtml" hash="d222e216465d2ede7f87f3dadb2dee37"/></dir><dir name="address"><file name="book.phtml" hash="b31cf726c0ceecdbcb414531fb4bac03"/><file name="edit.phtml" hash="438d701bf22fda1e97ce01d07fb5cd65"/></dir><dir name="form"><file name="address.phtml" hash="c8644adb22b0c3d96ae2e4d3c5302e5f"/><file name="changepassword.phtml" hash="240dab89dc88f285cded4a64f38edb4a"/><file name="confirmation.phtml" hash="d0c81d2896cc570de2d4cd42611e73a8"/><file name="edit.phtml" hash="6fd41257904a0e2cb595f9de5c1b1283"/><file name="forgotpassword.phtml" hash="a19e766fa6c2dc06b835da1eb00dfafc"/><file name="login.phtml" hash="adac97d2b418438e4c31a42ced0e8a48"/><file name="mini.login.phtml" hash="24d09a1d4ec2023f3767e91211545243"/><file name="newsletter.phtml" hash="0bafe0aceda804f9da5898abc449c108"/><file name="register.phtml" hash="1cdabd071a5c7c7bf8905ec4b116141d"/></dir><dir name="order"><file name="view.phtml" hash="1a01a49bb7b8c2c8e2f12f063056c826"/></dir><dir name="widget"><file name="dob.phtml" hash="a19c80a0826d867a1676df68dfd759eb"/><file name="name.phtml" hash="b5782a6dca0e72a13b9c3ed9cb2159a0"/><file name="taxvat.phtml" hash="90f20cd2d8090ce8a37736caec07e503"/></dir><file name="address.phtml" hash="6b75ebcc1ec2586db731045d4161890a"/><file name="balance.phtml" hash="da9f8fa46d12a3dc7277dc6cf1fa4a13"/><file name="logout.phtml" hash="5dcd8e145f634fbd7d27b515d8b7582d"/><file name="orders.phtml" hash="fef7ae48cec30b6e27af3238bdb4a3a4"/><file name="wishlist.phtml" hash="57c44f1197bed317ab0f70e81ea6bd95"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="4670eb2ba16f1ddaa350d2edb74ce0eb"/></dir><file name="currency.phtml" hash="f7a5c9e12e46c6d1c084cc2260a2e246"/></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="c68f23d2152101396cc8f0ea743cb0b5"/><file name="samples.phtml" hash="44c0a95537374a28b2ef7dc61af83081"/><file name="type.phtml" hash="c8812cbea63ed61c218a223608bc2d37"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="ca79aecfc367a66f2472f48a4df1fd55"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="9d16cb2078c4cef18d1ec09282e80d27"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="e1536bf066aa2a9402cd0ae87fae1e9f"/></dir></dir><file name="success.phtml" hash="3a03beb83b20a623c0a8e364c0015cdc"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="d3b3a11fe38c46c02dcd6d2c4c0f6fcf"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="d0a310bd1117fc84443a53e9d9687400"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="0282e9403b6551c80bc424251cbaca7a"/></dir><dir name="order"><file name="downloadable.phtml" hash="16a6d6963fb5deb32a28378098239d21"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="63b11beb3c90be589886d0788a11c078"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="51c8430e7c5d3959e87e511533c5e8e3"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b9b117e382f27add54b56e751f4c9e38"/></dir><file name="renderer.phtml" hash="143415b140ba16e97c0a1807c40e6e09"/></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="cfe5211ef1d5c0785ca92065f4b88186"/></dir><dir name="invoice"><file name="items.phtml" hash="4e245ebd1d0005e011c67c000849f5c0"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="e99fe3121b7b80e36690715a09bd6550"/></dir><dir name="invoice"><file name="default.phtml" hash="e99fe3121b7b80e36690715a09bd6550"/></dir><dir name="order"><file name="default.phtml" hash="7f3b388e6b84046e1c771b632ebde612"/></dir><dir name="shipment"><file name="default.phtml" hash="40dab7ab90f7514acfe3e1d4ab408e60"/></dir></dir><dir name="shipment"><file name="items.phtml" hash="e38d0caba217e50d86320f49ad86b8da"/><file name="track.phtml" hash="e9810f489eda94dd7584444ee033fb59"/></dir><file name="items.phtml" hash="362c381e40ecdda30cba5300e339e896"/></dir><dir name="productalert"><file name="price.phtml" hash="b0e82922f05837ee68f29695483f4e81"/><file name="stock.phtml" hash="e1c6a78ca40ddd2fc87b714a64d64fd8"/></dir></dir><dir name="giftmessage"><file name="form.phtml" hash="2189441f6329cd1c7522bb3e467cd059"/><file name="helper.phtml" hash="ae0f4b7d8bfab3aba1e933a2001d1247"/><file name="inline.phtml" hash="4e6c8579f7797fa40957898f5c4269a0"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="47f80f80bc586a135d168e5cc12a372a"/><file name="link.phtml" hash="640b8d022d5476330ba155691e1f0d3d"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="e5836ac3bbd2bc710fec7477ff38276f"/></dir><dir name="page"><dir name="html"><file name="breadcrumbs.phtml" hash="bf72bc34af13a8a488ec0cef023e4b27"/><file name="footer.phtml" hash="ea657e715fc3f4fd17b6d46af8d2671b"/><file name="head.phtml" hash="1fea2048b0f43e79e325455c29186cba"/><file name="header.phtml" hash="b947b5b8c3c5bf3c68b7feb2a4697340"/><file name="pager.phtml" hash="37945676a2c4f93a1c9c7511e9e525f6"/><file name="top.links.phtml" hash="8599292fc6f27cdda2cf4dc8eb2e6d09"/><file name="wrapper.phtml" hash="a527f8b78162d1ccf89bf9c2b6d58e62"/></dir><dir name="switch"><file name="flags.phtml" hash="f7cee579500a0dde7ffa8f8ac6a069e8"/><file name="languages.phtml" hash="74bc530b7a284333c6dbfb63c233fa1b"/><file name="stores.phtml" hash="687bff8b05ac6b17f242a10479169df8"/></dir><dir name="template"><file name="container.phtml" hash="48a40301b0a26dbdd0de0f91d5adcc4d"/><file name="links.phtml" hash="9af7db5636ddd7faf2eed94cec40c1e9"/></dir><file name="1column.phtml" hash="f2aae419e58d98edc3b80bdd14829c27"/><file name="2columns-left.phtml" hash="87f05d9d7562b921a3affbd1a715c4ea"/><file name="2columns-right.phtml" hash="c8b57c6dcf0eee72bd66ae40a00ddcd3"/><file name="3columns.phtml" hash="4ff7095128b3237c87035151d7d9c787"/><file name="popup.phtml" hash="a4e73e22b8ec51b3aea5a8303bb3b250"/><file name="print.phtml" hash="53837eaccfcc0a83e54da945e07f125f"/><file name="redirect.phtml" hash="0711eff223361681d2d12b2061f42cb1"/></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="e2212577c2c9c28e00c66a1908d46fb3"/><file name="ccsave.phtml" hash="07ff3a0a20f00e31b5443800ebacb7f1"/><file name="checkmo.phtml" hash="395800ebbbd31f85c5c19f211f804c09"/><file name="purchaseorder.phtml" hash="63c6fb59568ad1f8a7170c231e947785"/></dir><dir name="info"><file name="cc.phtml" hash="3b58308f891f7456accfaef2cdbf4e3c"/><file name="ccsave.phtml" hash="f13dccb79ee937279722e34db2d75150"/><file name="checkmo.phtml" hash="68c1345716d154c63d6089c94d0e1c5d"/><file name="default.phtml" hash="5b12a176647450847712b5ddb5b7c1cb"/><file name="purchaseorder.phtml" hash="a258df940fb85b0dbd41221934cbee40"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="61f34a3d49929852e8278b6371479962"/></dir><file name="form.phtml" hash="dacfbd1a1d0a82b9d2e6bc2ecf88ab00"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="5a09c7220681003bcc3c9e6cc4694042"/></dir><dir name="standard"><file name="form.phtml" hash="99832274cde55a2c9999d89d38dd8c88"/></dir><file name="link.phtml" hash="a58135aa8c3451f479d0c5e1ce86d01b"/></dir><dir name="paypaluk"><dir name="direct"><file name="form.phtml" hash="df5728a0068b15ec6c56323b4f893b4e"/><file name="info.phtml" hash="91705c0d3cb8cb336aee5a24e57a93c9"/></dir><dir name="express"><dir name="review"><file name="details.phtml" hash="c8ccfb9c1eb05d86a10dc449f678e78c"/></dir><file name="form.phtml" hash="3ab14fedc24e6200b21ce5376cc34037"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="750608c895d5b302f9db119ff1f7aae3"/></dir><file name="link.phtml" hash="10a1748caabeecddf45b0792e770453b"/></dir><dir name="poll"><file name="active.phtml" hash="1779dac29251a5c782acf743bfddeeb1"/><file name="result.phtml" hash="72f240de2738a6245e1f2358bd372bfd"/></dir><dir name="productalert"><file name="price.phtml" hash="fbf4d4bd39aba47214e5517841300f9a"/><file name="stock.phtml" hash="c71de1c94128176d10de171743505525"/></dir><dir name="rating"><file name="detailed.phtml" hash="f805bcd92a7fda64a099928a812541bc"/><file name="empty.phtml" hash="5b8bb08fb214c543dfe26ff202891c7e"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="421dc0f3bfe7f0885c80560ce953cc50"/><file name="home_product_viewed.phtml" hash="81e52257f6a37ddd8c4a191c235b2bd5"/><file name="product_compared.phtml" hash="46f95495f89b745532386ca5f9cf392e"/><file name="product_viewed.phtml" hash="935074d1fc7041908e453537a23fa893"/></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="50996dd1969c2b09c328e39c7a97cd42"/><file name="recent.phtml" hash="07eb31712f2baf612e094dc9fed6bafa"/><file name="view.phtml" hash="ac2a40f8298e2a63a880d155196b8190"/></dir><dir name="helper"><file name="summary.phtml" hash="b2b0ba9cd00e13e32dd76efb02100d0f"/><file name="summary_short.phtml" hash="22dc079532ce1407c7c1f83f92e32aef"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="f5c8e159786a1e2486c4dac8dfb66e1e"/><file name="list.phtml" hash="07059ba73bf0540c04d4e1a12ab5df20"/><file name="other.phtml" hash="ff7173288f722adad334cd3b1a9f588f"/></dir></dir><file name="form.phtml" hash="300d77db884521c3404ea3c87a161cb5"/><file name="view.phtml" hash="4af924813e6a0170c72ff0dd0b385f73"/></dir><dir name="rss"><dir name="order"><file name="details.phtml" hash="b5d5a99587a8545bdb9c6a0d70a042d3"/></dir><file name="list.phtml" hash="0fbdeef4328ce1f95445add0d8544387"/><file name="nofeed.phtml" hash="76502bd485ec3713e10802eba65d4e58"/></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="2a352211a3378803a919e59e7b39896d"/></dir></dir><file name="items.phtml" hash="265a5b99ea0ddce705664b3ff7273065"/></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="ee34d85a40e144f3264a2868d5a034c4"/></dir></dir><file name="items.phtml" hash="26d2bfb70592ea816c6c4ef22004fcaf"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="7a4175d2dc4cf1d95e6f32e634e95b55"/></dir></dir><dir name="print"><file name="creditmemo.phtml" hash="a25cd04a4250c57f61b00ec9588ec0af"/><file name="invoice.phtml" hash="e24161137cd90d6d5a3371553e0e9023"/><file name="shipment.phtml" hash="bc8d28f761e0fdbf5b9fb8c516595439"/><file name="tax.phtml" hash="bf254c2d780f00e18b1c00f95b067db8"/></dir><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="638f8f565efa05b7d26738f1994a1fa5"/></dir></dir><file name="items.phtml" hash="e4dd2210be4241543cee82e1b440ebc1"/></dir><file name="creditmemo.phtml" hash="8d13ffb5de2e98c02e22d6a55f498a29"/><file name="details.phtml" hash="e7cad4cdf7f1ff69473161ed11585d3c"/><file name="history.phtml" hash="a87edd981e6a0451181139cd2bf45b98"/><file name="info.phtml" hash="97ed7ec4d4032bbb19cc1ddd0447feed"/><file name="invoice.phtml" hash="d26a29413f8574543b11a0775f2ac46d"/><file name="items.phtml" hash="6f14ea4daf34822ca7d70d51bf87c653"/><file name="print.phtml" hash="6bd000e5429a241354f1be38da5342e9"/><file name="recent.phtml" hash="33733728c39ad12a7e9ef0ede33d3a07"/><file name="shipment.phtml" hash="3c451556d2205e02489094a2dcfee65e"/><file name="tax.phtml" hash="ec921ad542c485c3959482d58bd28809"/><file name="trackinginfo.phtml" hash="1c680d4542402f269b4c635804a04f77"/><file name="view.phtml" hash="370773c9384b0d954670bca11aaf60a5"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="8ccb45b3745e12d010400d3e287fd6cc"/></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="fc8f0cdd4573346b9119356291641d56"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="popup.phtml" hash="fb601d65ec85db1860620716da993872"/></dir></dir><dir name="tag"><dir name="customer"><file name="edit.phtml" hash="98f1043e06c2d29a4e4aa6ff7d5c060b"/><file name="recent.phtml" hash="edd2e285ce655539e067644013b5094f"/><file name="tags.phtml" hash="1d3551b3f3713dbc6d32ba205fdc2c51"/><file name="view.phtml" hash="aa64c5d4b4551d9f2f0bd7faf7c416ac"/></dir><dir name="product"><file name="result.phtml" hash="d8ef80c71effcde769732397b961a03a"/></dir><file name="cloud.phtml" hash="dfb3592054b773c08a522091cf5de233"/><file name="list.phtml" hash="daf3a8ecb82f0b271aae9e199390940e"/><file name="mytags.phtml" hash="b6efff2bc3bb2139a4057f8c1eb989f4"/><file name="popular.phtml" hash="41aa202199f6f0ca648e16076484bfbf"/><file name="result.phtml" hash="dea62fd62de4c403f93334d361ec19ec"/><file name="search.phtml" hash="6222566c51093557e1de7c363dd8169f"/></dir><dir name="wishlist"><dir name="email"><file name="items.phtml" hash="546c2d345323aaebe27a23d5c838a3e2"/><file name="rss.phtml" hash="fe00d171bdd383f4fbf97bf1de054a41"/></dir><file name="shared.phtml" hash="83dfab61444198fe1c7c0fca357865dc"/><file name="sharing.phtml" hash="1a2d61eb37e586e67158aca1b45b7970"/><file name="sidebar.phtml" hash="7100232fc784ccb848634d26fb356b5f"/><file name="view.phtml" hash="fcc4a99258305e33b0117c8357c5d7fa"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.2.0.3</min><max>1.2.0.3</max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Blank</name>
4
+ <version>1.2.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL 3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>A clean simplistic design interface that can be easily customized by professional designers</summary>
10
  <description>A clean simplistic design interface that can be easily customized by professional designers</description>
11
+ <notes>1.2.1</notes>
12
  <authors><author><name>Magento Core Team</name><user>auto-converted</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2009-02-02</date>
14
+ <time>15:05:10</time>
15
+ <contents><target name="mageskin"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="css"><file name="clears.css" hash="3d33e824e9fe88915a0f9f1e7f9c147d"/><file name="print.css" hash="1839347706087be0a9c2e3088e5f2f1d"/><file name="reset.css" hash="46b100011fbdbac465f2921b5b9a5f6a"/><file name="styles-ie.css" hash="0fa5219accfc0d1cde2964722107ce69"/><file name="styles.css" hash="0d671487c1f16386193056270eb708d8"/></dir><dir name="images"><dir name="catalog"><dir name="product"><dir name="placeholder"><file name="image.jpg" hash="097ab8a3051bc037ea3de0e17f440540"/><file name="small_image.jpg" hash="f825d16f97a640453553c79c48ebaa73"/><file name="thumbnail.jpg" hash="b2b682d28a08a748a73d2cda70ab5a57"/></dir></dir></dir><dir name="media"><file name="404_callout1.jpg" hash="834e53a03e2921a2fd3c135c0c7189df"/><file name="404_callout2.jpg" hash="016984b4a1579df34147f9407098db73"/><file name="about_us_img.jpg" hash="726f36dd75b5a709a1a14acab1660188"/><file name="col_left_callout.jpg" hash="5f762006021e046f9bd536f37ea7c463"/><file name="col_right_callout.jpg" hash="dae22f37a542da272a35195ec286ec25"/></dir><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_rating.gif" hash="0a8777c815350ddf1e316a537ad0c335"/><file name="btn_google_checkout.gif" hash="843d75249ce05b5d87ca5419f37b1c3b"/><file name="btn_paypal_checkout.gif" hash="6edd61270b7b5632eafad10557129114"/><file name="btn_trash.gif" hash="bcb22f558a0eb32243a2a36645189e9f"/><file name="btn_window_close.gif" hash="c83f3cbbb2aedfc580dff78d5cfb63ed"/><file name="cvv.gif" hash="ed0f392004a405466291071a760b285d"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="icon_big_rss.png" hash="6cf70e7c52a3f3d7b833ccadb041a555"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_rss.gif" hash="e5bbc388d818c142868b4a1df0b48793"/><file name="list_remove_btn.gif" hash="6182e723aa2a253dc6cf334a3dfaaa84"/><file name="logo.gif" hash="6c1c8318d7dd57cc674f2f3cddf04344"/><file name="logo_email.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="logo_print.gif" hash="3901817e7bdd9456699f7a267078f2ff"/><file name="magnifier_handle.gif" hash="238fbdd7959f517db11c6f57ee4daaf4"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="opc-ajax-loader.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="pager_arrow_left.gif" hash="75973b020105dccbaf34e49d7852552d"/><file name="pager_arrow_right.gif" hash="ed4d6640624c2b6edeab4c212314bd6d"/><file name="slider_bg.gif" hash="87bc1b46d87de4f6252c7216216627c3"/><file name="slider_btn_zoom_in.gif" hash="ef0fc67f77f30827ee67f4e744b60781"/><file name="slider_btn_zoom_out.gif" hash="68b3d1c28dc5aec4f6b64d70a6996b6f"/><file name="sort_asc_arrow.gif" hash="40aa554212d6a1f60593c27d78d85fa3"/><file name="sort_desc_arrow.gif" hash="92fd194bfae4ce5ae3354e1e47d7ac7d"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/></dir><dir name="js"><file name="bundle.js" hash="7fb06ec966f79c0488198975a69c6c0b"/><file name="giftmessage.js" hash="98f056ae92e10813f0d550daae6dd944"/><file name="opcheckout.js" hash="88c8105c1a196534fdb5ebc7f216cb8c"/><file name="paypal.js" hash="4793d611370033c7daec147f135672b5"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="blank"><dir name="default"><dir name="layout"><file name="bundle.xml" hash="2b604899f9dea76c550866d7d774d2e0"/><file name="catalog.xml" hash="359d90f692b67b46736c702be63c3506"/><file name="catalogsearch.xml" hash="b21a5126f8cff8c4da6c853c8163f769"/><file name="checkout.xml" hash="ee2b9f38a9dcc0d971a9204bce49cc36"/><file name="cms.xml" hash="9a4eb9fa95b1e217ab30a654e7423821"/><file name="contacts.xml" hash="e3e3eb3dcf2c276fa11d66722a0a1c62"/><file name="core.xml" hash="99c290a45fc882985b55279180d6a491"/><file name="customer.xml" hash="a180537185e2e90d25f3e7efa7298b35"/><file name="directory.xml" hash="eb1bb63ef64fc8283a69f13fd3f90005"/><file name="downloadable.xml" hash="a4bb31c7d838e10893fe2a54a7636592"/><file name="giftmessage.xml" hash="d91f058897e4ae05938b44960a87a7c0"/><file name="googleanalytics.xml" hash="72fd608e307339080bc2b0e28762644d"/><file name="googlecheckout.xml" hash="c24d4770dec193a19a72834beb1951df"/><file name="googleoptimizer.xml" hash="c8b25d432c8d2d1892834af7a3f35667"/><file name="newsletter.xml" hash="06e2fa151b7034cd74268684d2050309"/><file name="page.xml" hash="edc6889fc4f4f406b0501b4533b3f455"/><file name="paypal.xml" hash="53eed662b8f4486b6a0064ba480b92e4"/><file name="paypaluk.xml" hash="e1f0523007cc3d4b523b6be24fa4e950"/><file name="poll.xml" hash="3cd2707dc21722104fc344c3d342a4b9"/><file name="productalert.xml" hash="8760bb53020762f38f2b854840017a9b"/><file name="reports.xml" hash="5a5c702eb1447187f08191d1d9a5e03d"/><file name="review.xml" hash="45b1dd918723370021ca91570f1d80eb"/><file name="rss.xml" hash="fcad94b8d76d848a2f4f558db95327b5"/><file name="sales.xml" hash="b325c89f0069ecc6845eeb4bef0f41a1"/><file name="sendfriend.xml" hash="515511b04f660095caed35c617bbab28"/><file name="shipping.xml" hash="89377704115050fe38a219c4abcf7ec6"/><file name="tag.xml" hash="3b13589cc8a8231ce8a73ff3b6eb2c31"/><file name="wishlist.xml" hash="b4cda0f01fc23f3466c7692cc8fb9801"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="793e1ff86039f24caff6fad87a094fa1"/></dir></dir><dir name="template"><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="list"><file name="partof.phtml" hash="f0d5c55a57290a885664ea86e133b679"/></dir><dir name="view"><dir name="type"><dir name="bundle"><dir name="option"><file name="checkbox.phtml" hash="c4d2679d1daa39b510b50333e207c5f2"/><file name="multi.phtml" hash="7faa0e1b19d975d3638711aac4deb6d7"/><file name="radio.phtml" hash="0fe4a1916cd43b89f5e0681b2a095af9"/><file name="select.phtml" hash="cc85f0bccd13e65e65db247913e74382"/></dir><file name="options.phtml" hash="be546769aaa064f1340eff43e38066d3"/></dir><file name="bundle.phtml" hash="d0e59e1797172c8eb0f257059c43f50b"/></dir><file name="price.phtml" hash="5d61ae7dde0a2334c1e67c42412e03a9"/><file name="tierprices.phtml" hash="87c95796e53d19a9756c8e33df7eacfb"/></dir><file name="price.phtml" hash="e8a4ed53bcf630bf1fbc5dfdb8c4cac1"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="4144bdfa26bc8c6bfef2b415c047b97d"/></dir><dir name="invoice"><file name="default.phtml" hash="ef20fe460ac338cf1716f36ca3b3281b"/></dir><dir name="order"><file name="default.phtml" hash="f0927ef4c5ad576690523804f086ba39"/></dir><dir name="shipment"><file name="default.phtml" hash="5d8cf3065959e86c2be887716bce3b6e"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><file name="renderer.phtml" hash="13838f159a3a715dc3ea9a2a2eb9e2d0"/></dir></dir><dir name="invoice"><dir name="items"><file name="renderer.phtml" hash="beb07e7cf3afecab1de9ac680e75ee5e"/></dir></dir><dir name="items"><file name="renderer.phtml" hash="f1262c5c7ee594efee32839c5d3b1364"/></dir><dir name="shipment"><dir name="items"><file name="renderer.phtml" hash="cdaed2ead9dc418f041e398f29a87afa"/></dir></dir></dir></dir></dir><dir name="callouts"><file name="left_col.phtml" hash="da32aafba925f37aeab347e4f93b1403"/><file name="right_col.phtml" hash="14e517ae3aeb65a1a5861dbb6aa81c1b"/></dir><dir name="catalog"><dir name="category"><file name="page.phtml" hash="aadf8b6c6e7657d5987dc4fc8898f81a"/><file name="view.phtml" hash="68897ae0f611b891d1dd20dfb10a1630"/></dir><dir name="layer"><file name="filter.phtml" hash="ad88f40ef09460cc31f3cf3b8b132742"/><file name="state.phtml" hash="493c701dbb66786af9872a6137f5f10f"/><file name="view.phtml" hash="f42d2e546bedbf1d84b1bb8c8ccc1282"/></dir><dir name="navigation"><file name="left.phtml" hash="75bf0af3c058c16568263cf4938ed0d0"/><file name="top.phtml" hash="6a856216d0b08d3bed2b0f360597ace2"/></dir><dir name="product"><dir name="compare"><file name="list.phtml" hash="f71016df7f5cdfd7e915076192bd70ab"/><file name="sidebar.phtml" hash="c3e8b037526065bfcae2aef12ffcd7b0"/></dir><dir name="list"><file name="related.phtml" hash="a9983d41a2b877735795313c3a3db3a4"/><file name="toolbar.phtml" hash="c08d6d828a77c65ffc1b1dce63268aee"/><file name="upsell.phtml" hash="9ac23c3998f86d91341b81d88dd3aa5c"/></dir><dir name="view"><dir name="options"><dir name="type"><file name="date.phtml" hash="6e84105edec52c7ec566713dccefe87d"/><file name="default.phtml" hash="e164beb01b3077fa1bf9a9bbb341ad56"/><file name="file.phtml" hash="805652068a3cd4224e62ab946a1803b1"/><file name="select.phtml" hash="15d350c5944b75b93236c59f1ab70e86"/><file name="text.phtml" hash="5594a2889cd9cb7c7e784446205411ff"/></dir><dir name="wrapper"><file name="bottom.phtml" hash="9be3658960ada4f4c774736829076538"/></dir><file name="wrapper.phtml" hash="c10ed9f230ecc827a1c2f99c9a4b4d46"/></dir><dir name="type"><dir name="options"><file name="configurable.phtml" hash="8eb194d7cef5bf44842c3380cbcd68ad"/></dir><file name="configurable.phtml" hash="9e3f4a6fb16ab3de753dae23796cde11"/><file name="grouped.phtml" hash="6b29550dd2f515dd37f84acf1f05f52b"/><file name="simple.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/><file name="virtual.phtml" hash="559ea95ea29fc6024e8abfae88fd90ff"/></dir><file name="additional.phtml" hash="6fc511a523e1b3065765365aa194520a"/><file name="addto.phtml" hash="13630226d178b97229191ca9535c7457"/><file name="addtocart.phtml" hash="cc1091934b28ee93bac4ff7e8dda9d0b"/><file name="attributes.phtml" hash="e346dc81d9222db8f6c4e6415d21e47e"/><file name="description.phtml" hash="7e18c1608cb82f8a8c107e5568438e91"/><file name="media.phtml" hash="a7d10d0a7e3232d29fce64276c1d454b"/><file name="options.phtml" hash="a54bcbd166d4a07219aa3f5b6291afe8"/><file name="price.phtml" hash="6ad72e4f21ddeba52027a7faade0e7cd"/><file name="price_clone.phtml" hash="8b72619d07da2aa9c7c11c1017068731"/><file name="tierprices.phtml" hash="3ac2d5f5338c97a67f2e7a81e741295e"/></dir><file name="gallery.phtml" hash="dd58f98d6cf094f2cd024f9b4458af1f"/><file name="list.phtml" hash="271c7c8ad0d01d1299c8a65c1faea818"/><file name="new.phtml" hash="fe42f21177ccc9171a2126c8a7b1e232"/><file name="price.phtml" hash="7986bd0043a7064af9ce3f2ff03f6de5"/><file name="view.phtml" hash="3aea7d7e88eeceb8fa9970f1c2957110"/></dir><dir name="seo"><dir name="sitemap"><file name="container.phtml" hash="a952fcb12c6c8cd2f51313fa63dba74c"/></dir><file name="sitemap.phtml" hash="87b64dbb6d15edf894a1170ed954596d"/></dir></dir><dir name="catalogsearch"><dir name="advanced"><file name="form.phtml" hash="8076150501f5051b8876212539e10f1f"/><file name="result.phtml" hash="7fbb20b3ff57cb9f7d4eb2479ea3c72b"/></dir><file name="form.mini.phtml" hash="71803ed517beaa1176e42ad9181651bb"/><file name="result.phtml" hash="07470604fb50e5a3b25432f49a206006"/><file name="term.phtml" hash="66ab2560641b0872c3211f3d8f42e33a"/></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="da98c1f8b6c47397717ea14c16290aca"/></dir><dir name="render"><file name="default.phtml" hash="8e7ab38d3369344c947c0793846d7d38"/><file name="simple.phtml" hash="3bfcaa834c96f5ad09277587ec82636f"/></dir><dir name="sidebar"><file name="default.phtml" hash="2ee8ff5d5918f851dad4c7b789b40771"/></dir><file name="coupon.phtml" hash="0f47b671f2f28ba2a9b317ca112a7475"/><file name="crosssell.phtml" hash="8f8401b8180283fb6fa3607b4b0e8810"/><file name="noItems.phtml" hash="03f31b1e9168d12b3ba9dc2f8bd1f760"/><file name="shipping.phtml" hash="4476cd2fdb736eca745768aa68be853e"/><file name="sidebar.phtml" hash="7841d505317e5f6d5e0cde4a2a9f2c6b"/><file name="totals.phtml" hash="01b900fbbd994771ea04ed56c86339ec"/></dir><dir name="multishipping"><dir name="address"><file name="select.phtml" hash="2b3c82fad5fcde0b9d02a141519dde69"/></dir><dir name="billing"><file name="items.phtml" hash="70f639ad42813a3da7cd32456d3a2845"/></dir><dir name="item"><file name="default.phtml" hash="bf3ff3612005dbd7dff5b538673a3db6"/></dir><file name="addresses.phtml" hash="dd5de430ccbf4554f8f0525b6f50da69"/><file name="agreements.phtml" hash="0cc2c61890723b3c810f4165b0b6ea8e"/><file name="billing.phtml" hash="377d2434635722800b7e48a497ad4a4a"/><file name="link.phtml" hash="c4225a9a1bbd9f177199119209469b11"/><file name="overview.phtml" hash="efed56ad7b22899afb3f8bbaabf4cbe8"/><file name="shipping.phtml" hash="396208d67285f2fdc1e052cefa20379c"/><file name="state.phtml" hash="a82cbe78e6abfa201db2c2af4063aa94"/><file name="success.phtml" hash="176224e9774b28520d8b7e07d22db6ba"/></dir><dir name="onepage"><dir name="payment"><file name="methods.phtml" hash="513839214b355ac6f1ec879230459d05"/></dir><dir name="review"><file name="info.phtml" hash="2c15313a73bfd31aec32ecbd511f9b51"/><file name="item.phtml" hash="f5f3ee3ad4430d94b09d5243875ae197"/><file name="totals.phtml" hash="63fb070ddef121951ed09f78641b17a4"/></dir><dir name="shipping_method"><file name="additional.phtml" hash="1f8a9204df1f5854c76ab9e729f1e191"/><file name="available.phtml" hash="b3794aa3ea6c16633292390b5e5100f0"/></dir><file name="agreements.phtml" hash="0527bfb427c60aa956791bcfc3aa2baa"/><file name="billing.phtml" hash="5207f18b54ed643ddcdbe96bee74466e"/><file name="failure.phtml" hash="5c6c4a68a56edbe050f084e441231f69"/><file name="link.phtml" hash="3ee2e026b7ca9f052db065b35ef6fcd7"/><file name="login.phtml" hash="8815aa7c39bc7133941f327dbfe64af2"/><file name="payment.phtml" hash="a4bbb98233c87128a91573e93f29fcf9"/><file name="progress.phtml" hash="44f9aed669a32f4edcff52760d283a6d"/><file name="review.phtml" hash="495f48bcc50ab3abd0efac683f4be4e1"/><file name="shipping.phtml" hash="66f34e6de976356c9e68e75967fc9b05"/><file name="shipping_method.phtml" hash="5f3d0140324ad1dca3901d14d0531277"/></dir><dir name="total"><file name="default.phtml" hash="4a680113802974e087a73b572129a11b"/><file name="tax.phtml" hash="445fd8fd4d463610f33014596a0871ba"/></dir><file name="cart.phtml" hash="c77bbb58780661aa0cd8eee498d00dd8"/><file name="links.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="onepage.phtml" hash="2ee5d54e33dfacb4f1cdd58ea12e12c1"/><file name="success.phtml" hash="dac0fd8f84f2607379eff82da2c8fb5c"/></dir><dir name="cms"><dir name="default"><file name="home.phtml" hash="cae87e8ece9b2cf11d56f58f78b61354"/><file name="no-route.phtml" hash="a82130a7e80d0f544fe904b1b8795a1b"/></dir><file name="content.phtml" hash="5bc7aa683ad79c7a422478c6cc67a963"/><file name="meta.phtml" hash="73c1b59cdc8e7ec40d294f3ac755005c"/></dir><dir name="contacts"><file name="form.phtml" hash="a48b4c5517e3ae407c9ceb89c24e249d"/></dir><dir name="core"><file name="formkey.phtml" hash="6f59eb9cc856f4f5b3ee30756300e2a6"/><file name="messages.phtml" hash="31f0e7850e552a1e67d8d99a5c0fbe1b"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="2a9ec75a331b2411809154b99bb7020e"/><file name="hello.phtml" hash="a3870656761e58365a6f19e105d340ec"/><file name="info.phtml" hash="737b388782a4ca8b58d9295fbed7f16b"/><file name="newsletter.phtml" hash="22d34e6401ff61b26e48de0a7052bbd1"/><file name="sidebar.phtml" hash="affc0973c249464f98d6592ce4a52538"/></dir><dir name="link"><file name="back.phtml" hash="c0a1831d7f2926c3499fb9bbc2d519d5"/></dir><file name="dashboard.phtml" hash="116bef22699a11e2433fbc44ccdb87f7"/><file name="navigation.phtml" hash="d222e216465d2ede7f87f3dadb2dee37"/></dir><dir name="address"><file name="book.phtml" hash="b31cf726c0ceecdbcb414531fb4bac03"/><file name="edit.phtml" hash="be1c61ad9fdd809b454f1a345b899a60"/></dir><dir name="form"><file name="address.phtml" hash="c8644adb22b0c3d96ae2e4d3c5302e5f"/><file name="changepassword.phtml" hash="240dab89dc88f285cded4a64f38edb4a"/><file name="confirmation.phtml" hash="d0c81d2896cc570de2d4cd42611e73a8"/><file name="edit.phtml" hash="2184fd5d256255aea3037961c6fdfcc1"/><file name="forgotpassword.phtml" hash="a19e766fa6c2dc06b835da1eb00dfafc"/><file name="login.phtml" hash="adac97d2b418438e4c31a42ced0e8a48"/><file name="mini.login.phtml" hash="24d09a1d4ec2023f3767e91211545243"/><file name="newsletter.phtml" hash="d18f2df1c273d5b233e7610e60efee1f"/><file name="register.phtml" hash="1cdabd071a5c7c7bf8905ec4b116141d"/></dir><dir name="order"><file name="view.phtml" hash="1a01a49bb7b8c2c8e2f12f063056c826"/></dir><dir name="widget"><file name="dob.phtml" hash="a19c80a0826d867a1676df68dfd759eb"/><file name="name.phtml" hash="b5782a6dca0e72a13b9c3ed9cb2159a0"/><file name="taxvat.phtml" hash="90f20cd2d8090ce8a37736caec07e503"/></dir><file name="address.phtml" hash="6b75ebcc1ec2586db731045d4161890a"/><file name="balance.phtml" hash="da9f8fa46d12a3dc7277dc6cf1fa4a13"/><file name="logout.phtml" hash="5dcd8e145f634fbd7d27b515d8b7582d"/><file name="orders.phtml" hash="fef7ae48cec30b6e27af3238bdb4a3a4"/><file name="wishlist.phtml" hash="57c44f1197bed317ab0f70e81ea6bd95"/></dir><dir name="directory"><dir name="currency"><file name="switch.phtml" hash="4670eb2ba16f1ddaa350d2edb74ce0eb"/></dir><file name="currency.phtml" hash="f7a5c9e12e46c6d1c084cc2260a2e246"/></dir><dir name="downloadable"><dir name="catalog"><dir name="product"><file name="links.phtml" hash="8c266e046d3395015bbac0ec52a49c7e"/><file name="samples.phtml" hash="44c0a95537374a28b2ef7dc61af83081"/><file name="type.phtml" hash="9be57b1ac5f527f80cbc4a2ad1255ec9"/></dir></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="086ba82ff3a5d65e556cc8018d007160"/></dir></dir><dir name="multishipping"><dir name="item"><file name="downloadable.phtml" hash="9d16cb2078c4cef18d1ec09282e80d27"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="e1536bf066aa2a9402cd0ae87fae1e9f"/></dir></dir><file name="success.phtml" hash="3a03beb83b20a623c0a8e364c0015cdc"/></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="9678a0bb85b8ad3679a4c4147f011cd2"/></dir></dir><dir name="email"><dir name="order"><dir name="items"><dir name="creditmemo"><file name="downloadable.phtml" hash="d0a310bd1117fc84443a53e9d9687400"/></dir><dir name="invoice"><file name="downloadable.phtml" hash="0282e9403b6551c80bc424251cbaca7a"/></dir><dir name="order"><file name="downloadable.phtml" hash="16a6d6963fb5deb32a28378098239d21"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="6bcd5db6eac66d81680e6631d29389ae"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="5b9fe362d1cb7ede71b4f937a08d00bd"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="c8070ded6c72449463f086872c9a1bc0"/></dir></dir></dir></dir></dir><dir name="email"><dir name="order"><dir name="creditmemo"><file name="items.phtml" hash="cfe5211ef1d5c0785ca92065f4b88186"/></dir><dir name="invoice"><file name="items.phtml" hash="4e245ebd1d0005e011c67c000849f5c0"/></dir><dir name="items"><dir name="creditmemo"><file name="default.phtml" hash="e99fe3121b7b80e36690715a09bd6550"/></dir><dir name="invoice"><file name="default.phtml" hash="e99fe3121b7b80e36690715a09bd6550"/></dir><dir name="order"><file name="default.phtml" hash="7f3b388e6b84046e1c771b632ebde612"/></dir><dir name="shipment"><file name="default.phtml" hash="40dab7ab90f7514acfe3e1d4ab408e60"/></dir></dir><dir name="shipment"><file name="items.phtml" hash="e38d0caba217e50d86320f49ad86b8da"/><file name="track.phtml" hash="e9810f489eda94dd7584444ee033fb59"/></dir><file name="items.phtml" hash="362c381e40ecdda30cba5300e339e896"/></dir><dir name="productalert"><file name="price.phtml" hash="b0e82922f05837ee68f29695483f4e81"/><file name="stock.phtml" hash="e1c6a78ca40ddd2fc87b714a64d64fd8"/></dir></dir><dir name="giftmessage"><file name="form.phtml" hash="2189441f6329cd1c7522bb3e467cd059"/><file name="helper.phtml" hash="ae0f4b7d8bfab3aba1e933a2001d1247"/><file name="inline.phtml" hash="4e6c8579f7797fa40957898f5c4269a0"/></dir><dir name="googlecheckout"><file name="form.phtml" hash="47f80f80bc586a135d168e5cc12a372a"/><file name="link.phtml" hash="640b8d022d5476330ba155691e1f0d3d"/></dir><dir name="newsletter"><file name="subscribe.phtml" hash="e5836ac3bbd2bc710fec7477ff38276f"/></dir><dir name="page"><dir name="html"><file name="breadcrumbs.phtml" hash="bf72bc34af13a8a488ec0cef023e4b27"/><file name="footer.phtml" hash="ea657e715fc3f4fd17b6d46af8d2671b"/><file name="head.phtml" hash="1fea2048b0f43e79e325455c29186cba"/><file name="header.phtml" hash="b947b5b8c3c5bf3c68b7feb2a4697340"/><file name="pager.phtml" hash="37945676a2c4f93a1c9c7511e9e525f6"/><file name="top.links.phtml" hash="8599292fc6f27cdda2cf4dc8eb2e6d09"/><file name="wrapper.phtml" hash="a527f8b78162d1ccf89bf9c2b6d58e62"/></dir><dir name="switch"><file name="flags.phtml" hash="f7cee579500a0dde7ffa8f8ac6a069e8"/><file name="languages.phtml" hash="74bc530b7a284333c6dbfb63c233fa1b"/><file name="stores.phtml" hash="0f0f7e563d7df0ab16777b696989fe85"/></dir><dir name="template"><file name="container.phtml" hash="48a40301b0a26dbdd0de0f91d5adcc4d"/><file name="links.phtml" hash="bc8780b3628c6fc5a667c9959c5bbf2f"/></dir><file name="1column.phtml" hash="f2aae419e58d98edc3b80bdd14829c27"/><file name="2columns-left.phtml" hash="87f05d9d7562b921a3affbd1a715c4ea"/><file name="2columns-right.phtml" hash="c8b57c6dcf0eee72bd66ae40a00ddcd3"/><file name="3columns.phtml" hash="4ff7095128b3237c87035151d7d9c787"/><file name="popup.phtml" hash="a4e73e22b8ec51b3aea5a8303bb3b250"/><file name="print.phtml" hash="53837eaccfcc0a83e54da945e07f125f"/><file name="redirect.phtml" hash="0711eff223361681d2d12b2061f42cb1"/></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="e2212577c2c9c28e00c66a1908d46fb3"/><file name="ccsave.phtml" hash="07ff3a0a20f00e31b5443800ebacb7f1"/><file name="checkmo.phtml" hash="395800ebbbd31f85c5c19f211f804c09"/><file name="purchaseorder.phtml" hash="63c6fb59568ad1f8a7170c231e947785"/></dir><dir name="info"><file name="cc.phtml" hash="3b58308f891f7456accfaef2cdbf4e3c"/><file name="ccsave.phtml" hash="f13dccb79ee937279722e34db2d75150"/><file name="checkmo.phtml" hash="68c1345716d154c63d6089c94d0e1c5d"/><file name="default.phtml" hash="5b12a176647450847712b5ddb5b7c1cb"/><file name="purchaseorder.phtml" hash="a258df940fb85b0dbd41221934cbee40"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="bf6edb45ed660c6efd96ad696bbb81b6"/></dir><file name="form.phtml" hash="dacfbd1a1d0a82b9d2e6bc2ecf88ab00"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="67d49d023b6e681a7f67fb8921f734aa"/></dir><dir name="standard"><file name="form.phtml" hash="99832274cde55a2c9999d89d38dd8c88"/></dir><file name="link.phtml" hash="a58135aa8c3451f479d0c5e1ce86d01b"/></dir><dir name="paypaluk"><dir name="direct"><file name="form.phtml" hash="df5728a0068b15ec6c56323b4f893b4e"/><file name="info.phtml" hash="91705c0d3cb8cb336aee5a24e57a93c9"/></dir><dir name="express"><dir name="review"><file name="details.phtml" hash="c8ccfb9c1eb05d86a10dc449f678e78c"/></dir><file name="form.phtml" hash="3ab14fedc24e6200b21ce5376cc34037"/><file name="info.phtml" hash="e5055353ca8855207dbd981208ee3e66"/><file name="review.phtml" hash="750608c895d5b302f9db119ff1f7aae3"/></dir><file name="link.phtml" hash="10a1748caabeecddf45b0792e770453b"/></dir><dir name="poll"><file name="active.phtml" hash="1779dac29251a5c782acf743bfddeeb1"/><file name="result.phtml" hash="72f240de2738a6245e1f2358bd372bfd"/></dir><dir name="productalert"><file name="price.phtml" hash="fbf4d4bd39aba47214e5517841300f9a"/><file name="stock.phtml" hash="c71de1c94128176d10de171743505525"/></dir><dir name="rating"><file name="detailed.phtml" hash="f805bcd92a7fda64a099928a812541bc"/><file name="empty.phtml" hash="5b8bb08fb214c543dfe26ff202891c7e"/></dir><dir name="reports"><file name="home_product_compared.phtml" hash="421dc0f3bfe7f0885c80560ce953cc50"/><file name="home_product_viewed.phtml" hash="81e52257f6a37ddd8c4a191c235b2bd5"/><file name="product_compared.phtml" hash="46f95495f89b745532386ca5f9cf392e"/><file name="product_viewed.phtml" hash="935074d1fc7041908e453537a23fa893"/></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="50996dd1969c2b09c328e39c7a97cd42"/><file name="recent.phtml" hash="07eb31712f2baf612e094dc9fed6bafa"/><file name="view.phtml" hash="ac2a40f8298e2a63a880d155196b8190"/></dir><dir name="helper"><file name="summary.phtml" hash="b2b0ba9cd00e13e32dd76efb02100d0f"/><file name="summary_short.phtml" hash="22dc079532ce1407c7c1f83f92e32aef"/></dir><dir name="product"><dir name="view"><file name="count.phtml" hash="f5c8e159786a1e2486c4dac8dfb66e1e"/><file name="list.phtml" hash="07059ba73bf0540c04d4e1a12ab5df20"/><file name="other.phtml" hash="ff7173288f722adad334cd3b1a9f588f"/></dir></dir><file name="form.phtml" hash="300d77db884521c3404ea3c87a161cb5"/><file name="view.phtml" hash="4af924813e6a0170c72ff0dd0b385f73"/></dir><dir name="rss"><dir name="order"><file name="details.phtml" hash="b5d5a99587a8545bdb9c6a0d70a042d3"/></dir><file name="list.phtml" hash="0fbdeef4328ce1f95445add0d8544387"/><file name="nofeed.phtml" hash="76502bd485ec3713e10802eba65d4e58"/></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="f72adf88d26a48c4de54560b49fea738"/></dir></dir><file name="items.phtml" hash="52130b4aeb78e9fa6c3f72af274bb308"/></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="89fa1d6d876ae90175b6ddae4f12c5dd"/></dir></dir><file name="items.phtml" hash="ea358c0e49bf92e118f14f78926be231"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="4ad28beab01830ca01a9e8b9493ba49e"/></dir></dir><dir name="print"><file name="creditmemo.phtml" hash="6b61ea13f19b8dd5f1eeee3675ff1372"/><file name="invoice.phtml" hash="45ed0ac3a21ed32b7199810be8993849"/><file name="shipment.phtml" hash="ba4b85f514a83de6f259444518560898"/><file name="tax.phtml" hash="bf254c2d780f00e18b1c00f95b067db8"/></dir><dir name="shipment"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="f94377748a5e05e73b8d434026a7aa87"/></dir></dir><file name="items.phtml" hash="afa536b18c2789aa85696b7c52b335c9"/></dir><file name="creditmemo.phtml" hash="8d13ffb5de2e98c02e22d6a55f498a29"/><file name="details.phtml" hash="e7cad4cdf7f1ff69473161ed11585d3c"/><file name="history.phtml" hash="14112c258f4f5117d74c17b4ac2065a6"/><file name="info.phtml" hash="f640cecc102c71a5a6476df8ad808759"/><file name="invoice.phtml" hash="d26a29413f8574543b11a0775f2ac46d"/><file name="items.phtml" hash="6f14ea4daf34822ca7d70d51bf87c653"/><file name="print.phtml" hash="e025ef349695c93b75a6bac5a59eb1f1"/><file name="recent.phtml" hash="280bf0b2d61e7a564d5bead06e9784ce"/><file name="shipment.phtml" hash="3c451556d2205e02489094a2dcfee65e"/><file name="tax.phtml" hash="ec921ad542c485c3959482d58bd28809"/><file name="trackinginfo.phtml" hash="1c680d4542402f269b4c635804a04f77"/><file name="view.phtml" hash="378f90425cb314f3c3391f7716c87998"/></dir><dir name="reorder"><file name="sidebar.phtml" hash="b0c36396d00a13f9269489bacb811afd"/></dir></dir><dir name="sendfriend"><file name="send.phtml" hash="fc8f0cdd4573346b9119356291641d56"/></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="affc0973c249464f98d6592ce4a52538"/><file name="popup.phtml" hash="c33633bf5670d630f1204fb09f05d006"/></dir></dir><dir name="tag"><dir name="customer"><file name="edit.phtml" hash="98f1043e06c2d29a4e4aa6ff7d5c060b"/><file name="recent.phtml" hash="edd2e285ce655539e067644013b5094f"/><file name="tags.phtml" hash="1d3551b3f3713dbc6d32ba205fdc2c51"/><file name="view.phtml" hash="aa64c5d4b4551d9f2f0bd7faf7c416ac"/></dir><dir name="product"><file name="result.phtml" hash="d8ef80c71effcde769732397b961a03a"/></dir><file name="cloud.phtml" hash="dfb3592054b773c08a522091cf5de233"/><file name="list.phtml" hash="daf3a8ecb82f0b271aae9e199390940e"/><file name="mytags.phtml" hash="b6efff2bc3bb2139a4057f8c1eb989f4"/><file name="popular.phtml" hash="41aa202199f6f0ca648e16076484bfbf"/><file name="result.phtml" hash="dea62fd62de4c403f93334d361ec19ec"/><file name="search.phtml" hash="6222566c51093557e1de7c363dd8169f"/></dir><dir name="wishlist"><dir name="email"><file name="items.phtml" hash="546c2d345323aaebe27a23d5c838a3e2"/><file name="rss.phtml" hash="fe00d171bdd383f4fbf97bf1de054a41"/></dir><file name="shared.phtml" hash="83dfab61444198fe1c7c0fca357865dc"/><file name="sharing.phtml" hash="eb8593eb1c268fa2c2d0825eb18914dd"/><file name="sidebar.phtml" hash="2cae9770f689258e7f6fa0e9413f16e8"/><file name="view.phtml" hash="fcc4a99258305e33b0117c8357c5d7fa"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.2.1</min><max>1.2.2</max></package></required></dependencies>
18
  </package>
skin/frontend/blank/default/css/reset.css CHANGED
@@ -67,6 +67,7 @@ ul,ol { list-style:none; }
67
  .a-left { text-align:left !important; }
68
  .a-center { text-align:center !important; }
69
  .a-right { text-align:right !important; }
 
70
  .v-middle { vertical-align:middle; }
71
  .f-left,
72
  .left { float:left !important; }
67
  .a-left { text-align:left !important; }
68
  .a-center { text-align:center !important; }
69
  .a-right { text-align:right !important; }
70
+ .v-top { vertical-align:middle; }
71
  .v-middle { vertical-align:middle; }
72
  .f-left,
73
  .left { float:left !important; }
skin/frontend/blank/default/css/styles-ie.css CHANGED
@@ -90,7 +90,8 @@ input.checkbox { width:13px; height:13px; }
90
  .group-select li,
91
  .buttons-set,
92
  .buttons-set2,
93
- .page-print .print-head { zoom:1; }
 
94
 
95
  /* Hover Fix */
96
  iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
90
  .group-select li,
91
  .buttons-set,
92
  .buttons-set2,
93
+ .page-print .print-head,
94
+ .cart-tax-total { zoom:1; }
95
 
96
  /* Hover Fix */
97
  iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
skin/frontend/blank/default/css/styles.css CHANGED
@@ -137,7 +137,7 @@ input.radio { margin-right:3px; }
137
  input.checkbox { margin-right:3px; }
138
  input.qty { width:2.5em !important; }
139
  /*button::-moz-focus-inner { padding:0; border:0; }*/
140
- button.button { overflow:visible; width:auto; background:#f6f6f6; border:1px solid #717171; cursor:pointer; }
141
  button.button span { display:block; margin:0; padding:0 8px 1px; font:bold 12px/16px Arial, Helvetica, sans-serif; text-align:center; white-space:nowrap; color:#000; }
142
  button.disabled {}
143
  button.disabled span {}
@@ -260,6 +260,13 @@ tr.show-details td {}
260
  tr.tax-details td { background-color:#f6f6f6; }
261
  tr.tax-details-first td {}
262
 
 
 
 
 
 
 
 
263
  /* Lists Decoration */
264
  li.odd {}
265
  li.even { background-color:#f6f6f6; }
@@ -366,7 +373,6 @@ dd.even { background-color:#f6f6f6; }
366
 
367
  /* Block: Banner */
368
  .block-banner {}
369
- .block-banner {}
370
  .block-banner .block-content { text-align:center; }
371
 
372
  /* Block: Checkout Progress */
@@ -584,6 +590,9 @@ a.minimal-price-link .price { font-weight:normal; }
584
 
585
  /* CMS Home Page */
586
  .cms-home .products-grid td { width:20%; }
 
 
 
587
  /* ======================================================================================= */
588
 
589
 
137
  input.checkbox { margin-right:3px; }
138
  input.qty { width:2.5em !important; }
139
  /*button::-moz-focus-inner { padding:0; border:0; }*/
140
+ button.button { overflow:visible; width:auto; background:#f6f6f6; border:1px solid #717171; cursor:pointer; /*-webkit-border-fit:lines;*/ }
141
  button.button span { display:block; margin:0; padding:0 8px 1px; font:bold 12px/16px Arial, Helvetica, sans-serif; text-align:center; white-space:nowrap; color:#000; }
142
  button.disabled {}
143
  button.disabled span {}
260
  tr.tax-details td { background-color:#f6f6f6; }
261
  tr.tax-details-first td {}
262
 
263
+ /* Shopping cart tax info */
264
+ .cart-tax-info,
265
+ .cart-price { padding-right:20px; }
266
+ .cart-tax-total { cursor:pointer; }
267
+ .cart-tax-total { padding-right:20px; background:url(../images/bg_collapse.gif) 100% 4px no-repeat; cursor:pointer; }
268
+ .cart-tax-total-expanded { background-position:100% -52px; }
269
+
270
  /* Lists Decoration */
271
  li.odd {}
272
  li.even { background-color:#f6f6f6; }
373
 
374
  /* Block: Banner */
375
  .block-banner {}
 
376
  .block-banner .block-content { text-align:center; }
377
 
378
  /* Block: Checkout Progress */
590
 
591
  /* CMS Home Page */
592
  .cms-home .products-grid td { width:20%; }
593
+
594
+ /* Sitemap */
595
+ .sitemap {}
596
  /* ======================================================================================= */
597
 
598