Interface_Frontend_Default_Iphone - Version 1.8.1.0

Version Notes

1.8.1.0

Download this release

Release Info

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


Code changes from version 1.8.0.0 to 1.8.1.0

Files changed (23) hide show
  1. app/design/frontend/default/iphone/layout/customer.xml +0 -15
  2. app/design/frontend/default/iphone/layout/sales.xml +18 -6
  3. app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml +247 -204
  4. app/design/frontend/default/iphone/template/catalog/product/gallery.phtml +2 -2
  5. app/design/frontend/default/iphone/template/catalog/product/price.phtml +143 -149
  6. app/design/frontend/default/iphone/template/checkout/cart.phtml +1 -0
  7. app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml +10 -10
  8. app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml +10 -10
  9. app/design/frontend/default/iphone/template/customer/form/login.phtml +1 -0
  10. app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml +10 -10
  11. app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml +10 -10
  12. app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml +145 -114
  13. app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml +143 -112
  14. app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml +160 -125
  15. app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml +1 -0
  16. app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml +1 -0
  17. app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml +189 -158
  18. app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml +178 -148
  19. app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml +201 -168
  20. app/design/frontend/default/iphone/template/wishlist/view.phtml +30 -14
  21. package.xml +6 -6
  22. skin/frontend/default/iphone/css/iphone.css +2 -65
  23. skin/frontend/default/iphone/js/iphone.js +265 -165
app/design/frontend/default/iphone/layout/customer.xml CHANGED
@@ -25,20 +25,6 @@
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
28
- Supported layout update handles (action):
29
- - customer_account_index
30
- - customer_address_index
31
- - customer_address_view
32
- - customer_account_login
33
- - customer_account_logoutsuccess
34
- - customer_account_create
35
- - customer_account_forgotpassword
36
- - customer_account_confirmation
37
- - customer_account_edit
38
-
39
- Supported layout update handles (special):
40
- - default
41
-
42
  -->
43
  <layout version="0.1.0">
44
 
@@ -74,7 +60,6 @@ Load this update on every page when customer is logged out
74
  <customer_logged_out>
75
  <reference name="account.links">
76
  <action method="addLink" translate="label title" module="customer"><label>Log In</label><url helper="customer/getLoginUrl"/><title>Log In</title><prepare/><urlParams/><position>1</position></action>
77
- <action method="removeLinkByUrl" ifconfig="enterprise_invitation/general/registration_required_invitation"><url helper="customer/getRegisterUrl" /></action>
78
  <!-- <action method="addLink" translate="label title" module="customer"><label>register</label><url helper="customer/getRegisterUrl" /><title>register</title><prepare/><urlParams/><position>100</position><li/><a/><before_text> or </before_text><after_text>.</after_text></action> -->
79
  </reference>
80
  <remove name="reorder"></remove>
25
  * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
26
  */
27
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
28
  -->
29
  <layout version="0.1.0">
30
 
60
  <customer_logged_out>
61
  <reference name="account.links">
62
  <action method="addLink" translate="label title" module="customer"><label>Log In</label><url helper="customer/getLoginUrl"/><title>Log In</title><prepare/><urlParams/><position>1</position></action>
 
63
  <!-- <action method="addLink" translate="label title" module="customer"><label>register</label><url helper="customer/getRegisterUrl" /><title>register</title><prepare/><urlParams/><position>100</position><li/><a/><before_text> or </before_text><after_text>.</after_text></action> -->
64
  </reference>
65
  <remove name="reorder"></remove>
app/design/frontend/default/iphone/layout/sales.xml CHANGED
@@ -230,7 +230,9 @@ Customer account home dashboard layout
230
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
231
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
232
  <action method="setValueProperties"><value>class="last a-right"</value></action>
233
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml" />
 
 
234
  </block>
235
  </block>
236
  </reference>
@@ -255,7 +257,9 @@ Customer account home dashboard layout
255
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
256
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
257
  <action method="setValueProperties"><value>class="a-right"</value></action>
258
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
259
  </block>
260
  </block>
261
  </reference>
@@ -287,7 +291,9 @@ Email layouts section
287
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
288
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
289
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
290
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
291
  </block>
292
  </block>
293
  <block type="core/text_list" name="additional.product.info" />
@@ -307,7 +313,9 @@ Email layouts section
307
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
308
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
309
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
310
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
311
  </block>
312
  </block>
313
  <block type="core/text_list" name="additional.product.info" />
@@ -476,7 +484,9 @@ Guest
476
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
477
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
478
  <action method="setValueProperties"><value>class="last a-right"</value></action>
479
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml" />
 
 
480
  </block>
481
  </block>
482
  </reference>
@@ -499,7 +509,9 @@ Guest
499
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
500
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
501
  <action method="setValueProperties"><value>class="a-right"</value></action>
502
- <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml"/>
 
 
503
  </block>
504
  </block>
505
  </reference>
230
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
231
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
232
  <action method="setValueProperties"><value>class="last a-right"</value></action>
233
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
234
+ <action method="setIsPlaneMode"><value>1</value></action>
235
+ </block>
236
  </block>
237
  </block>
238
  </reference>
257
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
258
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
259
  <action method="setValueProperties"><value>class="a-right"</value></action>
260
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
261
+ <action method="setIsPlaneMode"><value>1</value></action>
262
+ </block>
263
  </block>
264
  </block>
265
  </reference>
291
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
292
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
293
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
294
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
295
+ <action method="setIsPlaneMode"><value>1</value></action>
296
+ </block>
297
  </block>
298
  </block>
299
  <block type="core/text_list" name="additional.product.info" />
313
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
314
  <action method="setLabelProperties"><value>colspan="3" align="right" style="padding:3px 9px"</value></action>
315
  <action method="setValueProperties"><value>align="right" style="padding:3px 9px"</value></action>
316
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
317
+ <action method="setIsPlaneMode"><value>1</value></action>
318
+ </block>
319
  </block>
320
  </block>
321
  <block type="core/text_list" name="additional.product.info" />
484
  <block type="sales/order_invoice_totals" name="invoice_totals" template="sales/order/totals.phtml">
485
  <action method="setLabelProperties"><value>colspan="4" class="a-right"</value></action>
486
  <action method="setValueProperties"><value>class="last a-right"</value></action>
487
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
488
+ <action method="setIsPlaneMode"><value>1</value></action>
489
+ </block>
490
  </block>
491
  </block>
492
  </reference>
509
  <block type="sales/order_creditmemo_totals" name="creditmemo_totals" template="sales/order/totals.phtml">
510
  <action method="setLabelProperties"><value>colspan="6" class="a-right"</value></action>
511
  <action method="setValueProperties"><value>class="a-right"</value></action>
512
+ <block type="tax/sales_order_tax" name="tax" template="tax/order/tax.phtml">
513
+ <action method="setIsPlaneMode"><value>1</value></action>
514
+ </block>
515
  </block>
516
  </block>
517
  </reference>
app/design/frontend/default/iphone/template/bundle/sales/order/items/renderer.phtml CHANGED
@@ -26,317 +26,358 @@
26
  ?>
27
  <?php $parentItem = $this->getItem() ?>
28
  <?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
29
- <?php $_count = count ($items) ?>
30
  <?php $_index = 0 ?>
31
 
32
  <?php $_prevOptionId = '' ?>
33
 
34
  <?php foreach ($items as $_item): ?>
35
 
36
- <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
37
- <?php $_showlastRow = true ?>
38
- <?php else: ?>
39
- <?php $_showlastRow = false ?>
40
- <?php endif; ?>
41
 
42
- <?php if ($_item->getParentItem()): ?>
43
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
44
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
45
- <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
46
- <td colspan="2" class="option-name"><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
47
- </tr>
48
- <?php $_prevOptionId = $attributes['option_id'] ?>
 
 
 
49
  <?php endif; ?>
50
- <?php endif; ?>
51
 
52
- <?php if (!$_item->getParentItem()): ?>
53
- <tr>
54
- <th><?php echo $this->__('Product Name') ?></th>
55
- <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3></td>
56
- </tr>
57
- <?php else: ?>
58
- <tr>
59
- <th><?php echo $this->__('Product Name') ?></th>
60
- <td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
61
- </tr>
62
- <?php endif; ?>
63
- <tr>
64
- <th><?php echo $this->__('SKU') ?></th>
65
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($_item->getSku())) ?></td>
66
- </tr>
67
-
68
- <?php if (!$_item->getParentItem()): ?>
69
- <tr>
70
- <th class="a-right"><?php echo $this->__('Price') ?></th>
71
- <td class="a-right">
72
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
73
- <span class="price-excl-tax">
 
 
74
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
75
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
76
  <span class="cart-price">
77
  <?php endif; ?>
78
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
79
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
80
  </span>
81
  <?php endif; ?>
82
  <?php endif; ?>
83
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
85
  <?php else: ?>
86
- <span class="cart-price">
87
  <?php endif; ?>
88
 
89
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
90
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
91
- <?php else: ?>
92
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
93
- <?php endif; ?>
94
 
95
  </span>
96
 
97
 
98
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
99
 
100
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
101
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
102
  <small>
103
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
104
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
105
- <?php endforeach; ?>
 
106
  </small>
107
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
108
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
109
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
110
  <?php endforeach; ?>
111
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
112
  <small>
113
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
114
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
115
- <?php endforeach; ?>
 
116
  </small>
117
  <?php endif; ?>
118
  </span>
119
 
120
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
122
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
 
 
123
  </span>
124
- <?php endif; ?>
125
- <?php endif; ?>
126
  </span>
127
- <br />
128
- <?php endif; ?>
129
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
130
- <span class="price-incl-tax">
131
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
132
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
133
  <span class="cart-price">
134
  <?php endif; ?>
135
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
136
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
137
  </span>
138
  <?php endif; ?>
139
  <?php endif; ?>
140
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
141
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
142
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
143
  <?php else: ?>
144
- <span class="cart-price">
145
  <?php endif; ?>
146
 
147
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
149
- <?php else: ?>
150
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
151
- <?php endif; ?>
152
 
153
  </span>
154
 
155
 
156
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
157
 
158
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
159
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
160
  <small>
161
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
162
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
163
- <?php endforeach; ?>
 
164
  </small>
165
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
166
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
167
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
168
  <?php endforeach; ?>
169
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
  <small>
171
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
172
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
173
- <?php endforeach; ?>
 
174
  </small>
175
  <?php endif; ?>
176
  </span>
177
 
178
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
179
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
180
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
181
  </span>
182
- <?php endif; ?>
183
- <?php endif; ?>
184
  </span>
185
- <?php endif; ?>
186
- </td>
187
- </tr>
188
- <?php endif; ?>
189
 
190
- <?php if (($_item->getParentItem() && $this->isChildCalculated()) || (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
191
- <tr>
192
- <th class="a-center"><?php echo $this->__('Qty') ?></th>
193
- <td class="a-right">
194
  <span class="nobr">
195
  <?php if ($_item->getQtyOrdered() > 0): ?>
196
- <?php echo Mage::helper('sales')->__('Ordered'); ?>: <strong><?php echo $_item->getQtyOrdered()*1 ?></strong><br />
197
- <?php endif; ?>
198
- <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
199
- <?php echo Mage::helper('sales')->__('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong><br />
200
- <?php endif; ?>
201
- <?php if ($_item->getQtyCanceled() > 0): ?>
202
- <?php echo Mage::helper('sales')->__('Canceled'); ?>: <strong><?php echo $_item->getQtyCanceled()*1 ?></strong><br />
203
- <?php endif; ?>
204
- <?php if ($_item->getQtyRefunded() > 0): ?>
205
- <?php echo Mage::helper('sales')->__('Refunded'); ?>: <strong><?php echo $_item->getQtyRefunded()*1 ?></strong>
206
  <?php endif; ?>
 
 
 
 
 
 
 
 
 
 
 
 
207
  </span>
208
- </td>
209
- </tr>
210
- <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $this->isShipmentSeparately()): ?>
211
- <tr>
212
- <th class="a-center"><?php echo $this->__('Qty') ?></th>
213
- <td><span class="nobr"><?php echo Mage::helper('sales')->__('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong></span></td>
214
- </tr>
215
- <?php endif; ?>
 
216
 
217
 
218
- <?php if (!$_item->getParentItem()): ?>
219
- <tr>
220
- <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
221
- <td class="a-right">
222
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
223
- <span class="price-excl-tax">
224
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
225
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
  <span class="cart-price">
227
  <?php endif; ?>
228
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
229
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
230
  </span>
231
  <?php endif; ?>
232
  <?php endif; ?>
233
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
234
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
235
  <?php else: ?>
236
- <span class="cart-price">
237
  <?php endif; ?>
238
 
239
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
240
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
241
- <?php else: ?>
242
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
243
- <?php endif; ?>
244
 
245
  </span>
246
 
247
 
248
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
249
 
250
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
251
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
252
  <small>
253
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
254
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
255
- <?php endforeach; ?>
 
256
  </small>
257
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
258
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
259
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
260
  <?php endforeach; ?>
261
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
262
  <small>
263
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
264
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
265
- <?php endforeach; ?>
 
266
  </small>
267
  <?php endif; ?>
268
  </span>
269
 
270
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
271
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
272
- <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>
 
 
273
  </span>
274
- <?php endif; ?>
275
- <?php endif; ?>
276
  </span>
277
- <br />
278
- <?php endif; ?>
279
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
280
- <span class="price-incl-tax">
281
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
282
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
283
  <span class="cart-price">
284
  <?php endif; ?>
285
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
286
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
287
  </span>
288
  <?php endif; ?>
289
  <?php endif; ?>
290
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
291
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
292
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
293
  <?php else: ?>
294
- <span class="cart-price">
 
 
 
 
 
295
  <?php endif; ?>
296
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
297
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
298
- <?php else: ?>
299
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
300
- <?php endif; ?>
301
 
302
  </span>
303
 
304
 
305
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
306
 
307
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
308
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
309
  <small>
310
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
311
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
312
- <?php endforeach; ?>
 
313
  </small>
314
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
315
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
316
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
317
  <?php endforeach; ?>
318
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
319
  <small>
320
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
321
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
322
- <?php endforeach; ?>
 
323
  </small>
324
  <?php endif; ?>
325
  </span>
326
 
327
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
328
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
329
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
330
  </span>
331
- <?php endif; ?>
332
- <?php endif; ?>
333
 
334
 
335
 
336
  </span>
337
- <?php endif; ?>
338
- </td>
339
- <!--
340
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
341
  <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
342
  <?php endif; ?>
@@ -344,42 +385,44 @@
344
  <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?></th>
345
  <?php endif; ?>
346
  -->
347
- </tr>
348
- <?php endif; ?>
349
 
350
  <?php endforeach; ?>
351
 
352
  <?php if ($_showlastRow): ?>
353
- <tr class="border">
354
- <td>
355
- <?php if($_options = $this->getItemOptions()): ?>
356
- <dl class="item-options">
357
- <?php foreach ($_options as $_option) : ?>
358
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
359
- <?php if (!$this->getPrintStatus()): ?>
360
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
361
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
362
- <?php echo $_formatedOptionValue['value'] ?>
363
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
364
- <div class="truncated_full_value">
365
- <dl class="item-options">
366
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
367
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
368
- </dl>
369
- </div>
370
- <?php endif; ?>
371
- </dd>
372
- <?php else: ?>
373
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
 
 
 
374
  <?php endif; ?>
375
- <?php endforeach; ?>
376
- </dl>
377
- <?php endif; ?>
378
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
379
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
380
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
381
- <?php endif; ?>
382
- </td>
383
- <td>&nbsp;</td>
384
- </tr>
385
  <?php endif; ?>
26
  ?>
27
  <?php $parentItem = $this->getItem() ?>
28
  <?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
29
+ <?php $_count = count($items) ?>
30
  <?php $_index = 0 ?>
31
 
32
  <?php $_prevOptionId = '' ?>
33
 
34
  <?php foreach ($items as $_item): ?>
35
 
36
+ <?php if ($this->getItemOptions() || $parentItem->getDescription() || $this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
37
+ <?php $_showlastRow = true ?>
38
+ <?php else: ?>
39
+ <?php $_showlastRow = false ?>
40
+ <?php endif; ?>
41
 
42
+ <?php if ($_item->getParentItem()): ?>
43
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
44
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
45
+ <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
46
+ <td colspan="2" class="option-name">
47
+ <div class="option-label"><?php echo $attributes['option_label'] ?></div>
48
+ </td>
49
+ </tr>
50
+ <?php $_prevOptionId = $attributes['option_id'] ?>
51
+ <?php endif; ?>
52
  <?php endif; ?>
 
53
 
54
+ <?php if (!$_item->getParentItem()): ?>
55
+ <tr>
56
+ <th><?php echo $this->__('Product Name') ?></th>
57
+ <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3></td>
58
+ </tr>
59
+ <?php else: ?>
60
+ <tr>
61
+ <th><?php echo $this->__('Product Name') ?></th>
62
+ <td>
63
+ <div class="option-value"><?php echo $this->getValueHtml($_item) ?></div>
64
+ </td>
65
+ </tr>
66
+ <?php endif; ?>
67
+ <tr>
68
+ <th><?php echo $this->__('SKU') ?></th>
69
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($_item->getSku())) ?></td>
70
+ </tr>
71
+
72
+ <?php if (!$_item->getParentItem()): ?>
73
+ <tr>
74
+ <th class="a-right"><?php echo $this->__('Price') ?></th>
75
+ <td class="a-right">
76
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
77
+ <span class="price-excl-tax">
78
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
79
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
80
  <span class="cart-price">
81
  <?php endif; ?>
82
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
83
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
  </span>
85
  <?php endif; ?>
86
  <?php endif; ?>
87
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
88
+ <span class="cart-tax-total"
89
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
90
  <?php else: ?>
91
+ <span class="cart-price">
92
  <?php endif; ?>
93
 
94
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
95
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
96
+ <?php else: ?>
97
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
98
+ <?php endif; ?>
99
 
100
  </span>
101
 
102
 
103
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
104
 
105
+ <span class="cart-tax-info"
106
+ id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
107
+ style="display:none;">
108
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <small>
110
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
111
+ <span class="nobr"><?php echo $tax['title']; ?>
112
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
113
+ <?php endforeach; ?>
114
  </small>
115
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
116
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
117
+ <span class="nobr"><small><?php echo $tax['title']; ?>
118
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
119
  <?php endforeach; ?>
120
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
  <small>
122
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
123
+ <span class="nobr"><?php echo $tax['title']; ?>
124
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
125
+ <?php endforeach; ?>
126
  </small>
127
  <?php endif; ?>
128
  </span>
129
 
130
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
131
+ <span class="cart-tax-total"
132
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
133
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
134
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
135
  </span>
136
+ <?php endif; ?>
137
+ <?php endif; ?>
138
  </span>
139
+ <br/>
140
+ <?php endif; ?>
141
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
142
+ <span class="price-incl-tax">
143
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
144
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
145
  <span class="cart-price">
146
  <?php endif; ?>
147
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
148
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
  </span>
150
  <?php endif; ?>
151
  <?php endif; ?>
152
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
153
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
+ <span class="cart-tax-total"
155
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
156
  <?php else: ?>
157
+ <span class="cart-price">
158
  <?php endif; ?>
159
 
160
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
161
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
162
+ <?php else: ?>
163
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
164
+ <?php endif; ?>
165
 
166
  </span>
167
 
168
 
169
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
170
 
171
+ <span class="cart-tax-info"
172
+ id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
173
+ style="display:none;">
174
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
175
  <small>
176
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
177
+ <span class="nobr"><?php echo $tax['title']; ?>
178
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
179
+ <?php endforeach; ?>
180
  </small>
181
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
182
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
183
+ <span class="nobr"><small><?php echo $tax['title']; ?>
184
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
185
  <?php endforeach; ?>
186
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
187
  <small>
188
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
189
+ <span class="nobr"><?php echo $tax['title']; ?>
190
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
191
+ <?php endforeach; ?>
192
  </small>
193
  <?php endif; ?>
194
  </span>
195
 
196
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
197
+ <span class="cart-tax-total"
198
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
199
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
200
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
201
  </span>
202
+ <?php endif; ?>
203
+ <?php endif; ?>
204
  </span>
205
+ <?php endif; ?>
206
+ </td>
207
+ </tr>
208
+ <?php endif; ?>
209
 
210
+ <?php if (($_item->getParentItem() && $this->isChildCalculated()) || (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
211
+ <tr>
212
+ <th class="a-center"><?php echo $this->__('Qty') ?></th>
213
+ <td class="a-right">
214
  <span class="nobr">
215
  <?php if ($_item->getQtyOrdered() > 0): ?>
216
+ <?php echo Mage::helper('sales')->__('Ordered'); ?>:
217
+ <strong><?php echo $_item->getQtyOrdered() * 1 ?></strong><br/>
 
 
 
 
 
 
 
 
218
  <?php endif; ?>
219
+ <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
220
+ <?php echo Mage::helper('sales')->__('Shipped'); ?>:
221
+ <strong><?php echo $_item->getQtyShipped() * 1 ?></strong><br/>
222
+ <?php endif; ?>
223
+ <?php if ($_item->getQtyCanceled() > 0): ?>
224
+ <?php echo Mage::helper('sales')->__('Canceled'); ?>:
225
+ <strong><?php echo $_item->getQtyCanceled() * 1 ?></strong><br/>
226
+ <?php endif; ?>
227
+ <?php if ($_item->getQtyRefunded() > 0): ?>
228
+ <?php echo Mage::helper('sales')->__('Refunded'); ?>:
229
+ <strong><?php echo $_item->getQtyRefunded() * 1 ?></strong>
230
+ <?php endif; ?>
231
  </span>
232
+ </td>
233
+ </tr>
234
+ <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $this->isShipmentSeparately()): ?>
235
+ <tr>
236
+ <th class="a-center"><?php echo $this->__('Qty') ?></th>
237
+ <td><span class="nobr"><?php echo Mage::helper('sales')->__('Shipped'); ?>
238
+ : <strong><?php echo $_item->getQtyShipped() * 1 ?></strong></span></td>
239
+ </tr>
240
+ <?php endif; ?>
241
 
242
 
243
+ <?php if (!$_item->getParentItem()): ?>
244
+ <tr>
245
+ <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
246
+ <td class="a-right">
247
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
248
+ <span class="price-excl-tax">
249
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
250
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
  <span class="cart-price">
252
  <?php endif; ?>
253
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
254
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
255
  </span>
256
  <?php endif; ?>
257
  <?php endif; ?>
258
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
259
+ <span class="cart-tax-total"
260
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
261
  <?php else: ?>
262
+ <span class="cart-price">
263
  <?php endif; ?>
264
 
265
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
266
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
267
+ <?php else: ?>
268
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
269
+ <?php endif; ?>
270
 
271
  </span>
272
 
273
 
274
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
275
 
276
+ <span class="cart-tax-info"
277
+ id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
278
+ 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']; ?>
283
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
284
+ <?php endforeach; ?>
285
  </small>
286
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
287
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
288
+ <span class="nobr"><small><?php echo $tax['title']; ?>
289
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
290
  <?php endforeach; ?>
291
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
292
  <small>
293
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
294
+ <span class="nobr"><?php echo $tax['title']; ?>
295
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
296
+ <?php endforeach; ?>
297
  </small>
298
  <?php endif; ?>
299
  </span>
300
 
301
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
302
+ <span class="cart-tax-total"
303
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
304
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
305
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
306
  </span>
307
+ <?php endif; ?>
308
+ <?php endif; ?>
309
  </span>
310
+ <br/>
311
+ <?php endif; ?>
312
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
313
+ <span class="price-incl-tax">
314
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
315
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
316
  <span class="cart-price">
317
  <?php endif; ?>
318
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
319
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
320
  </span>
321
  <?php endif; ?>
322
  <?php endif; ?>
323
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
324
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
325
+ <span class="cart-tax-total"
326
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
327
  <?php else: ?>
328
+ <span class="cart-price">
329
+ <?php endif; ?>
330
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
331
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
332
+ <?php else: ?>
333
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
334
  <?php endif; ?>
 
 
 
 
 
335
 
336
  </span>
337
 
338
 
339
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
340
 
341
+ <span class="cart-tax-info"
342
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
343
+ style="display:none;">
344
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
345
  <small>
346
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
347
+ <span class="nobr"><?php echo $tax['title']; ?>
348
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
349
+ <?php endforeach; ?>
350
  </small>
351
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
352
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
353
+ <span class="nobr"><small><?php echo $tax['title']; ?>
354
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
355
  <?php endforeach; ?>
356
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
357
  <small>
358
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
359
+ <span class="nobr"><?php echo $tax['title']; ?>
360
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
361
+ <?php endforeach; ?>
362
  </small>
363
  <?php endif; ?>
364
  </span>
365
 
366
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
367
+ <span class="cart-tax-total"
368
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
369
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total Incl. Tax'); ?>
370
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
371
  </span>
372
+ <?php endif; ?>
373
+ <?php endif; ?>
374
 
375
 
376
 
377
  </span>
378
+ <?php endif; ?>
379
+ </td>
380
+ <!--
381
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
382
  <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
383
  <?php endif; ?>
385
  <th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('checkout')->getSubtotalInclTax($this->getItem())); ?></th>
386
  <?php endif; ?>
387
  -->
388
+ </tr>
389
+ <?php endif; ?>
390
 
391
  <?php endforeach; ?>
392
 
393
  <?php if ($_showlastRow): ?>
394
+ <tr class="border">
395
+ <td>
396
+ <?php if ($_options = $this->getItemOptions()): ?>
397
+ <dl class="item-options">
398
+ <?php foreach ($_options as $_option) : ?>
399
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
400
+ <?php if (!$this->getPrintStatus()): ?>
401
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
402
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
403
+ <?php echo $_formatedOptionValue['value'] ?>
404
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
405
+ <div class="truncated_full_value">
406
+ <dl class="item-options">
407
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
408
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
409
+ </dl>
410
+ </div>
411
+ <?php endif; ?>
412
+ </dd>
413
+ <?php else: ?>
414
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
415
+ <?php endif; ?>
416
+ <?php endforeach; ?>
417
+ </dl>
418
  <?php endif; ?>
419
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
420
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
421
+ <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
422
+ class="gift-message-link"
423
+ onclick="return giftMessageToogle('<?php echo $parentItem->getId() ?>')"><?php echo Mage::helper('sales')->__('Gift Message') ?></a>
424
+ <?php endif; ?>
425
+ </td>
426
+ <td>&nbsp;</td>
427
+ </tr>
 
428
  <?php endif; ?>
app/design/frontend/default/iphone/template/catalog/product/gallery.phtml CHANGED
@@ -29,11 +29,11 @@
29
  <div class="product-gallery" id="product-gallery">
30
  <ul>
31
  <li>
32
- <img src="<?php echo $this->helper('catalog/image')->init($_product, 'image')->resize(300) ?>" height="300" alt="<?php echo $this->escapeHtml($this->getImageLabel()) ?>" title="<?php echo $this->escapeHtml($this->getImageLabel()) ?>" />
33
  </li>
34
  <?php foreach ($this->getProduct()->getMediaGalleryImages() as $_image): ?>
35
  <li>
36
- <img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(300); ?>" height="300" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
37
  </li>
38
  <?php endforeach; ?>
39
  </ul>
29
  <div class="product-gallery" id="product-gallery">
30
  <ul>
31
  <li>
32
+ <img src="<?php echo $this->helper('catalog/image')->init($_product, 'image')->resize(300) ?>" height="300" width="300" alt="<?php echo $this->escapeHtml($this->getImageLabel()) ?>" title="<?php echo $this->escapeHtml($this->getImageLabel()) ?>" />
33
  </li>
34
  <?php foreach ($this->getProduct()->getMediaGalleryImages() as $_image): ?>
35
  <li>
36
+ <img src="<?php echo $this->helper('catalog/image')->init($this->getProduct(), 'thumbnail', $_image->getFile())->resize(300); ?>" height="300" width="300" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
37
  </li>
38
  <?php endforeach; ?>
39
  </ul>
app/design/frontend/default/iphone/template/catalog/product/price.phtml CHANGED
@@ -33,83 +33,79 @@
33
  */
34
  ?>
35
  <?php
36
- $_coreHelper = $this->helper('core');
37
- $_weeeHelper = $this->helper('weee');
38
- $_taxHelper = $this->helper('tax');
39
- /* @var $_coreHelper Mage_Core_Helper_Data */
40
- /* @var $_weeeHelper Mage_Weee_Helper_Data */
41
- /* @var $_taxHelper Mage_Tax_Helper_Data */
42
 
43
- $_product = $this->getProduct();
44
- $_storeId = $_product->getStoreId();
45
- $_id = $_product->getId();
46
- $_weeeSeparator = '';
47
- $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
48
- $_minimalPriceValue = $_product->getMinimalPrice();
49
- $_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);
50
  ?>
51
 
52
  <?php if (!$_product->isGrouped()): ?>
53
- <?php $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product); ?>
54
- <?php if ($_weeeHelper->typeOfDisplay($_product, array(Mage_Weee_Model_Tax::DISPLAY_INCL_DESCR, Mage_Weee_Model_Tax::DISPLAY_EXCL_DESCR_INCL, 4))): ?>
55
- <?php $_weeeTaxAmount = $_weeeHelper->getAmount($_product); ?>
56
- <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForDisplay($_product); ?>
57
- <?php endif; ?>
58
- <?php $_weeeTaxAmountInclTaxes = $_weeeTaxAmount; ?>
59
- <?php if ($_weeeHelper->isTaxable() && !$_taxHelper->priceIncludesTax($_storeId)): ?>
60
- <?php $_attributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true); ?>
61
- <?php $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_attributes); ?>
62
  <?php endif; ?>
63
 
64
- <div class="price-box">
65
  <?php $_price = $_taxHelper->getPrice($_product, $_product->getPrice()) ?>
66
  <?php $_regularPrice = $_taxHelper->getPrice($_product, $_product->getPrice(), $_simplePricesTax) ?>
67
  <?php $_finalPrice = $_taxHelper->getPrice($_product, $_product->getFinalPrice()) ?>
68
  <?php $_finalPriceInclTax = $_taxHelper->getPrice($_product, $_product->getFinalPrice(), true) ?>
69
  <?php $_weeeDisplayType = $_weeeHelper->getPriceDisplayType(); ?>
70
  <?php if ($_finalPrice >= $_price): ?>
71
- <?php if ($_taxHelper->displayBothPrices()): ?>
72
- <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
73
- <span class="price-excluding-tax">
74
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
75
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
76
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
77
  </span>
78
  </span>
79
- <span class="price-including-tax">
80
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
81
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
82
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
83
  </span>
84
  </span>
85
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
86
- <span class="price-excluding-tax">
87
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
88
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
89
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
90
  </span>
91
  </span>
92
- <span class="price-including-tax">
93
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
94
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
95
- <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
96
  </span>
97
  <span class="weee">(
98
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
99
  <?php echo $_weeeSeparator; ?>
100
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
101
  <?php $_weeeSeparator = ' + '; ?>
102
- <?php endforeach; ?>
103
  )</span>
104
  </span>
105
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
106
- <span class="price-excluding-tax">
107
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
108
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
109
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
110
  </span>
111
  </span>
112
- <span class="price-including-tax">
113
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
114
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
115
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
@@ -119,39 +115,39 @@
119
  <?php echo $_weeeSeparator; ?>
120
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
121
  <?php $_weeeSeparator = ' + '; ?>
122
- <?php endforeach; ?>
123
  )</span>
124
  </span>
125
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
126
- <span class="price-excluding-tax">
127
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
128
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
129
  <?php echo $_coreHelper->currency($_price, true, false) ?>
130
  </span>
131
  </span>
132
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
133
- <span class="weee">
134
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
135
  </span>
136
  <?php endforeach; ?>
137
- <span class="price-including-tax">
138
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
139
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
140
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
141
  </span>
142
  </span>
143
  <?php else: ?>
144
- <span class="price-excluding-tax">
145
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
146
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
147
  <?php if ($_finalPrice == $_price): ?>
148
- <?php echo $_coreHelper->currency($_price, true, false) ?>
149
  <?php else: ?>
150
- <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
151
  <?php endif; ?>
152
  </span>
153
  </span>
154
- <span class="price-including-tax">
155
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
156
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
157
  <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
@@ -159,66 +155,64 @@
159
  </span>
160
  <?php endif; ?>
161
  <?php else: ?>
162
- <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
163
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
164
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
 
165
  </span>
166
- <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
167
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
168
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
169
- </span>
170
- <span class="weee">(
171
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
172
- <?php echo $_weeeSeparator; ?>
173
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
174
- <?php $_weeeSeparator = ' + '; ?>
175
- <?php endforeach; ?>
176
- )</span>
177
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
178
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
179
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
180
  </span>
181
- <span class="weee">(
182
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
183
- <?php echo $_weeeSeparator; ?>
184
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
185
- <?php $_weeeSeparator = ' + '; ?>
186
- <?php endforeach; ?>
187
- )</span>
188
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
189
- <span class="regular-price"><?php echo $_coreHelper->currency($_price,true,true) ?></span><br />
190
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
191
- <span class="weee">
192
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
 
193
  </span>
194
  <?php endforeach; ?>
195
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
196
- <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
197
  </span>
198
  <?php else: ?>
199
- <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
200
  <?php if ($_finalPrice == $_price): ?>
201
- <?php echo $_coreHelper->currency($_price, true, true) ?>
202
- <?php else: ?>
203
- <?php echo $_coreHelper->currency($_finalPrice, true, true) ?>
204
- <?php endif; ?>
205
  </span>
206
  <?php endif; ?>
207
  <?php endif; ?>
208
  <?php else: /* if ($_finalPrice == $_price): */ ?>
209
- <?php $_originalWeeeTaxAmount = $_weeeHelper->getOriginalAmount($_product); ?>
210
 
211
- <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
212
- <p class="old-price">
213
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
214
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
215
  <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
216
  </span>
217
- </p>
218
 
219
- <?php if ($_taxHelper->displayBothPrices()): ?>
220
- <p class="special-price">
221
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
222
  <span class="price-excluding-tax">
223
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
224
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -231,26 +225,26 @@
231
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
232
  </span>
233
  </span>
234
- </p>
235
  <?php else: ?>
236
- <p class="special-price">
237
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
238
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
239
  <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
240
  </span>
241
- </p>
242
  <?php endif; ?>
243
 
244
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
245
- <p class="old-price">
246
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
247
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
248
  <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
249
  </span>
250
- </p>
251
 
252
- <p class="special-price">
253
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
254
  <span class="price-excluding-tax">
255
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
256
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -262,7 +256,7 @@
262
  <?php echo $_weeeSeparator; ?>
263
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
264
  <?php $_weeeSeparator = ' + '; ?>
265
- <?php endforeach; ?>
266
  )</span>
267
  <span class="price-including-tax">
268
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
@@ -270,17 +264,17 @@
270
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
271
  </span>
272
  </span>
273
- </p>
274
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
275
- <p class="old-price">
276
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
277
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
278
  <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
279
  </span>
280
- </p>
281
 
282
- <p class="special-price">
283
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
284
  <span class="price-excluding-tax">
285
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
286
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -292,7 +286,7 @@
292
  <?php echo $_weeeSeparator; ?>
293
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
294
  <?php $_weeeSeparator = ' + '; ?>
295
- <?php endforeach; ?>
296
  )</span>
297
  <span class="price-including-tax">
298
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
@@ -300,46 +294,46 @@
300
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
301
  </span>
302
  </span>
303
- </p>
304
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
305
- <p class="old-price">
306
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
307
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
308
  <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
309
  </span>
310
- </p>
311
 
312
- <p class="special-price">
313
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
314
  <span class="price-excluding-tax">
315
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
316
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
317
  <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
318
  </span>
319
  </span>
320
- <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
321
- <span class="weee">
322
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
323
  </span>
324
- <?php endforeach; ?>
325
- <span class="price-including-tax">
326
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
327
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
328
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
329
  </span>
330
  </span>
331
- </p>
332
  <?php else: // excl. ?>
333
- <p class="old-price">
334
- <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
335
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
336
  <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
337
  </span>
338
- </p>
339
 
340
- <?php if ($_taxHelper->displayBothPrices()): ?>
341
- <p class="special-price">
342
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
343
  <span class="price-excluding-tax">
344
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
345
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
@@ -352,14 +346,14 @@
352
  <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
353
  </span>
354
  </span>
355
- </p>
356
  <?php else: ?>
357
- <p class="special-price">
358
- <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
359
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
360
  <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
361
  </span>
362
- </p>
363
  <?php endif; ?>
364
  <?php endif; ?>
365
 
@@ -367,62 +361,62 @@
367
 
368
  <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_product->getFinalPrice()): ?>
369
 
370
- <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
371
- <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))): ?>
372
- <?php $_minimalPriceDisplayValue = $_minimalPrice + $_weeeTaxAmount; ?>
373
  <?php endif; ?>
374
 
375
- <?php if ($this->getUseLinkForAsLowAs()):?>
376
  <span class="minimal-price-link">
377
  <?php else:?>
378
  <span class="minimal-price-link">
379
  <?php endif?>
380
- <span class="label"><?php echo $this->__('As low as:') ?></span>
381
- <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
382
  <?php echo $_coreHelper->currency($_minimalPriceDisplayValue, true, false) ?>
383
  </span>
384
- <?php if ($this->getUseLinkForAsLowAs()):?>
385
  </span>
386
  <?php else:?>
387
  </span>
388
  <?php endif?>
389
  <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
390
- </div>
391
 
392
  <?php else: /* if (!$_product->isGrouped()): */ ?>
393
- <?php
394
  $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
395
  $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
396
  ?>
397
- <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
398
- <div class="price-box">
399
- <p class="minimal-price">
400
- <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
401
- <?php if ($_taxHelper->displayBothPrices()): ?>
402
- <span class="price-excluding-tax">
403
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
404
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
405
  <?php echo $_coreHelper->currency($_exclTax, true, false) ?>
406
  </span>
407
  </span>
408
- <span class="price-including-tax">
409
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
410
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
411
  <?php echo $_coreHelper->currency($_inclTax, true, false) ?>
412
  </span>
413
  </span>
414
- <?php else: ?>
415
- <?php
416
- $_showPrice = $_inclTax;
417
- if (!$_taxHelper->displayPriceIncludingTax()) {
418
- $_showPrice = $_exclTax;
419
- }
420
- ?>
421
- <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
422
  <?php echo $_coreHelper->currency($_showPrice, true, false) ?>
423
  </span>
424
- <?php endif; ?>
425
- </p>
426
- </div>
427
  <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice): */ ?>
428
  <?php endif; /* if (!$_product->isGrouped()): */ ?>
33
  */
34
  ?>
35
  <?php
36
+ $_coreHelper = $this->helper('core');
37
+ $_weeeHelper = $this->helper('weee');
38
+ $_taxHelper = $this->helper('tax');
39
+ /* @var $_coreHelper Mage_Core_Helper_Data */
40
+ /* @var $_weeeHelper Mage_Weee_Helper_Data */
41
+ /* @var $_taxHelper Mage_Tax_Helper_Data */
42
 
43
+ $_product = $this->getProduct();
44
+ $_storeId = $_product->getStoreId();
45
+ $_id = $_product->getId();
46
+ $_weeeSeparator = '';
47
+ $_simplePricesTax = ($_taxHelper->displayPriceIncludingTax() || $_taxHelper->displayBothPrices());
48
+ $_minimalPriceValue = $_product->getMinimalPrice();
49
+ $_minimalPrice = $_taxHelper->getPrice($_product, $_minimalPriceValue, $_simplePricesTax);
50
  ?>
51
 
52
  <?php if (!$_product->isGrouped()): ?>
53
+ <?php $_weeeTaxAmount = $_weeeHelper->getAmountForDisplay($_product); ?>
54
+ <?php $_weeeTaxAttributes = $_weeeHelper->getProductWeeeAttributesForRenderer($_product, null, null, null, true); ?>
55
+ <?php $_weeeTaxAmountInclTaxes = $_weeeTaxAmount; ?>
56
+ <?php if ($_weeeHelper->isTaxable()): ?>
57
+ <?php $_weeeTaxAmountInclTaxes = $_weeeHelper->getAmountInclTaxes($_weeeTaxAttributes); ?>
 
 
 
 
58
  <?php endif; ?>
59
 
60
+ <div class="price-box">
61
  <?php $_price = $_taxHelper->getPrice($_product, $_product->getPrice()) ?>
62
  <?php $_regularPrice = $_taxHelper->getPrice($_product, $_product->getPrice(), $_simplePricesTax) ?>
63
  <?php $_finalPrice = $_taxHelper->getPrice($_product, $_product->getFinalPrice()) ?>
64
  <?php $_finalPriceInclTax = $_taxHelper->getPrice($_product, $_product->getFinalPrice(), true) ?>
65
  <?php $_weeeDisplayType = $_weeeHelper->getPriceDisplayType(); ?>
66
  <?php if ($_finalPrice >= $_price): ?>
67
+ <?php if ($_taxHelper->displayBothPrices()): ?>
68
+ <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
69
+ <span class="price-excluding-tax">
70
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
71
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
72
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
73
  </span>
74
  </span>
75
+ <span class="price-including-tax">
76
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
77
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
78
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
79
  </span>
80
  </span>
81
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
82
+ <span class="price-excluding-tax">
83
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
84
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
85
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
86
  </span>
87
  </span>
88
+ <span class="price-including-tax">
89
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
90
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
91
+ <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmount, true, false) ?>
92
  </span>
93
  <span class="weee">(
94
  <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
95
  <?php echo $_weeeSeparator; ?>
96
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
97
  <?php $_weeeSeparator = ' + '; ?>
98
+ <?php endforeach; ?>
99
  )</span>
100
  </span>
101
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
102
+ <span class="price-excluding-tax">
103
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
104
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
105
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, false) ?>
106
  </span>
107
  </span>
108
+ <span class="price-including-tax">
109
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
110
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
111
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
115
  <?php echo $_weeeSeparator; ?>
116
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
117
  <?php $_weeeSeparator = ' + '; ?>
118
+ <?php endforeach; ?>
119
  )</span>
120
  </span>
121
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
122
+ <span class="price-excluding-tax">
123
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
124
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
125
  <?php echo $_coreHelper->currency($_price, true, false) ?>
126
  </span>
127
  </span>
128
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
129
+ <span class="weee">
130
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
131
  </span>
132
  <?php endforeach; ?>
133
+ <span class="price-including-tax">
134
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
135
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
136
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
137
  </span>
138
  </span>
139
  <?php else: ?>
140
+ <span class="price-excluding-tax">
141
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
142
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
143
  <?php if ($_finalPrice == $_price): ?>
144
+ <?php echo $_coreHelper->currency($_price, true, false) ?>
145
  <?php else: ?>
146
+ <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
147
  <?php endif; ?>
148
  </span>
149
  </span>
150
+ <span class="price-including-tax">
151
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
152
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
153
  <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
155
  </span>
156
  <?php endif; ?>
157
  <?php else: ?>
158
+ <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0) || $_weeeHelper->typeOfDisplay($_product, 1)): // including ?>
159
+ <?php $weeeAmountToDisplay = $_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?>
160
+ <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
161
+ <?php echo $_coreHelper->currency($_price + $weeeAmountToDisplay, true, true) ?>
162
  </span>
163
+ <span class="weee">(
164
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
165
+ <?php echo $_weeeSeparator; ?>
166
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?>
167
+ <?php $_weeeSeparator = ' + '; ?>
168
+ <?php endforeach; ?>
169
+ )</span>
 
 
 
 
170
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
171
+ <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
172
  <?php echo $_coreHelper->currency($_price + $_weeeTaxAmount, true, true) ?>
173
  </span>
174
+ <span class="weee">(
175
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
176
+ <?php echo $_weeeSeparator; ?>
177
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
178
+ <?php $_weeeSeparator = ' + '; ?>
179
+ <?php endforeach; ?>
180
+ )</span>
181
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
182
+ <span class="regular-price"><?php echo $_coreHelper->currency($_price,true,true) ?></span><br />
183
+ <?php $weeeAmountToDisplay = $_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAmountInclTaxes : $_weeeTaxAmount ?>
184
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
185
+ <span class="weee">
186
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + ($_taxHelper->displayPriceIncludingTax() ? $_weeeTaxAttribute->getTaxAmount() : 0), true, true); ?>
187
  </span>
188
  <?php endforeach; ?>
189
+ <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
190
+ <?php echo $_coreHelper->currency($_price + $weeeAmountToDisplay, true, true) ?>
191
  </span>
192
  <?php else: ?>
193
+ <span class="regular-price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
194
  <?php if ($_finalPrice == $_price): ?>
195
+ <?php echo $_coreHelper->currency($_price, true, true) ?>
196
+ <?php else: ?>
197
+ <?php echo $_coreHelper->currency($_finalPrice, true, true) ?>
198
+ <?php endif; ?>
199
  </span>
200
  <?php endif; ?>
201
  <?php endif; ?>
202
  <?php else: /* if ($_finalPrice == $_price): */ ?>
203
+ <?php $_originalWeeeTaxAmount = $_weeeHelper->getOriginalAmount($_product); ?>
204
 
205
+ <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 0)): // including ?>
206
+ <p class="old-price">
207
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
208
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
209
  <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
210
  </span>
211
+ </p>
212
 
213
+ <?php if ($_taxHelper->displayBothPrices()): ?>
214
+ <p class="special-price">
215
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
216
  <span class="price-excluding-tax">
217
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
218
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
225
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
226
  </span>
227
  </span>
228
+ </p>
229
  <?php else: ?>
230
+ <p class="special-price">
231
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
232
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
233
  <?php echo $_coreHelper->currency($_finalPrice + $_weeeTaxAmountInclTaxes, true, false) ?>
234
  </span>
235
+ </p>
236
  <?php endif; ?>
237
 
238
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 1)): // incl. + weee ?>
239
+ <p class="old-price">
240
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
241
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
242
  <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
243
  </span>
244
+ </p>
245
 
246
+ <p class="special-price">
247
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
248
  <span class="price-excluding-tax">
249
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
250
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
256
  <?php echo $_weeeSeparator; ?>
257
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
258
  <?php $_weeeSeparator = ' + '; ?>
259
+ <?php endforeach; ?>
260
  )</span>
261
  <span class="price-including-tax">
262
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
264
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
265
  </span>
266
  </span>
267
+ </p>
268
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 4)): // incl. + weee ?>
269
+ <p class="old-price">
270
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
271
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
272
  <?php echo $_coreHelper->currency($_regularPrice + $_originalWeeeTaxAmount, true, false) ?>
273
  </span>
274
+ </p>
275
 
276
+ <p class="special-price">
277
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
278
  <span class="price-excluding-tax">
279
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
280
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
286
  <?php echo $_weeeSeparator; ?>
287
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount() + $_weeeTaxAttribute->getTaxAmount(), true, true); ?>
288
  <?php $_weeeSeparator = ' + '; ?>
289
+ <?php endforeach; ?>
290
  )</span>
291
  <span class="price-including-tax">
292
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
294
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
295
  </span>
296
  </span>
297
+ </p>
298
  <?php elseif ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, 2)): // excl. + weee + final ?>
299
+ <p class="old-price">
300
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
301
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
302
  <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
303
  </span>
304
+ </p>
305
 
306
+ <p class="special-price">
307
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
308
  <span class="price-excluding-tax">
309
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
310
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
311
  <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
312
  </span>
313
  </span>
314
+ <?php foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
315
+ <span class="weee">
316
  <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $_coreHelper->currency($_weeeTaxAttribute->getAmount(), true, true); ?>
317
  </span>
318
+ <?php endforeach; ?>
319
+ <span class="price-including-tax">
320
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
321
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
322
  <?php echo $_coreHelper->currency($_finalPriceInclTax + $_weeeTaxAmountInclTaxes, true, false) ?>
323
  </span>
324
  </span>
325
+ </p>
326
  <?php else: // excl. ?>
327
+ <p class="old-price">
328
+ <span class="price-label"><?php echo $this->__('Regular Price:') ?></span>
329
  <span class="price" id="old-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
330
  <?php echo $_coreHelper->currency($_regularPrice, true, false) ?>
331
  </span>
332
+ </p>
333
 
334
+ <?php if ($_taxHelper->displayBothPrices()): ?>
335
+ <p class="special-price">
336
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
337
  <span class="price-excluding-tax">
338
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
339
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
346
  <?php echo $_coreHelper->currency($_finalPriceInclTax, true, false) ?>
347
  </span>
348
  </span>
349
+ </p>
350
  <?php else: ?>
351
+ <p class="special-price">
352
+ <span class="price-label"><?php echo $this->__('Special Price:') ?></span>
353
  <span class="price" id="product-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
354
  <?php echo $_coreHelper->currency($_finalPrice, true, false) ?>
355
  </span>
356
+ </p>
357
  <?php endif; ?>
358
  <?php endif; ?>
359
 
361
 
362
  <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue && $_minimalPriceValue < $_product->getFinalPrice()): ?>
363
 
364
+ <?php $_minimalPriceDisplayValue = $_minimalPrice; ?>
365
+ <?php if ($_weeeTaxAmount && $_weeeHelper->typeOfDisplay($_product, array(0, 1, 4))): ?>
366
+ <?php $_minimalPriceDisplayValue = $_minimalPrice + $_weeeTaxAmount; ?>
367
  <?php endif; ?>
368
 
369
+ <?php if ($this->getUseLinkForAsLowAs()):?>
370
  <span class="minimal-price-link">
371
  <?php else:?>
372
  <span class="minimal-price-link">
373
  <?php endif?>
374
+ <span class="label"><?php echo $this->__('As low as:') ?></span>
375
+ <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
376
  <?php echo $_coreHelper->currency($_minimalPriceDisplayValue, true, false) ?>
377
  </span>
378
+ <?php if ($this->getUseLinkForAsLowAs()):?>
379
  </span>
380
  <?php else:?>
381
  </span>
382
  <?php endif?>
383
  <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice && $_minimalPrice < $_finalPrice): */ ?>
384
+ </div>
385
 
386
  <?php else: /* if (!$_product->isGrouped()): */ ?>
387
+ <?php
388
  $_exclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue);
389
  $_inclTax = $_taxHelper->getPrice($_product, $_minimalPriceValue, true);
390
  ?>
391
+ <?php if ($this->getDisplayMinimalPrice() && $_minimalPriceValue): ?>
392
+ <div class="price-box">
393
+ <p class="minimal-price">
394
+ <span class="price-label"><?php echo $this->__('Starting at:') ?></span>
395
+ <?php if ($_taxHelper->displayBothPrices()): ?>
396
+ <span class="price-excluding-tax">
397
  <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax:') ?></span>
398
  <span class="price" id="price-excluding-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
399
  <?php echo $_coreHelper->currency($_exclTax, true, false) ?>
400
  </span>
401
  </span>
402
+ <span class="price-including-tax">
403
  <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax:') ?></span>
404
  <span class="price" id="price-including-tax-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
405
  <?php echo $_coreHelper->currency($_inclTax, true, false) ?>
406
  </span>
407
  </span>
408
+ <?php else: ?>
409
+ <?php
410
+ $_showPrice = $_inclTax;
411
+ if (!$_taxHelper->displayPriceIncludingTax()) {
412
+ $_showPrice = $_exclTax;
413
+ }
414
+ ?>
415
+ <span class="price" id="product-minimal-price-<?php echo $_id ?><?php echo $this->getIdSuffix() ?>">
416
  <?php echo $_coreHelper->currency($_showPrice, true, false) ?>
417
  </span>
418
+ <?php endif; ?>
419
+ </p>
420
+ </div>
421
  <?php endif; /* if ($this->getDisplayMinimalPrice() && $_minimalPrice): */ ?>
422
  <?php endif; /* if (!$_product->isGrouped()): */ ?>
app/design/frontend/default/iphone/template/checkout/cart.phtml CHANGED
@@ -45,6 +45,7 @@
45
  </ul>
46
  <?php endif; ?>
47
  <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post">
 
48
  <fieldset>
49
  <table id="shopping-cart-table" class="data-table cart-table">
50
  <tfoot>
45
  </ul>
46
  <?php endif; ?>
47
  <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post">
48
+ <?php echo $this->getBlockHtml('formkey') ?>
49
  <fieldset>
50
  <table id="shopping-cart-table" class="data-table cart-table">
51
  <tfoot>
app/design/frontend/default/iphone/template/checkout/cart/item/default.phtml CHANGED
@@ -116,11 +116,11 @@ $_options = $this->getOptionList();
116
  <?php endforeach; ?>
117
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
118
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
119
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
120
  <?php endforeach; ?>
121
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
122
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
123
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
124
  <?php endforeach; ?>
125
  <?php endif; ?>
126
  </div>
@@ -143,7 +143,7 @@ $_options = $this->getOptionList();
143
  <?php endif; ?>
144
 
145
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
146
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
147
  <?php else: ?>
148
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
149
  <?php endif; ?>
@@ -154,7 +154,7 @@ $_options = $this->getOptionList();
154
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
155
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
156
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
157
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
158
  <?php endforeach; ?>
159
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
160
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
@@ -169,7 +169,7 @@ $_options = $this->getOptionList();
169
 
170
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
171
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
172
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
173
  </div>
174
  <?php endif; ?>
175
  <?php endif; ?>
@@ -209,11 +209,11 @@ $_options = $this->getOptionList();
209
  <?php endforeach; ?>
210
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
211
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
212
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
213
  <?php endforeach; ?>
214
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
215
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
216
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
217
  <?php endforeach; ?>
218
  <?php endif; ?>
219
  </div>
@@ -240,7 +240,7 @@ $_options = $this->getOptionList();
240
  <span class="cart-msrp-subtotal">--</span>
241
  <?php else: ?>
242
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
243
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
244
  <?php else: ?>
245
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
246
  <?php endif; ?>
@@ -254,7 +254,7 @@ $_options = $this->getOptionList();
254
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
255
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
256
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
257
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
258
  <?php endforeach; ?>
259
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
260
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
@@ -269,7 +269,7 @@ $_options = $this->getOptionList();
269
 
270
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
271
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
272
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
273
  </div>
274
  <?php endif; ?>
275
  <?php endif; ?>
116
  <?php endforeach; ?>
117
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
118
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
119
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
120
  <?php endforeach; ?>
121
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
122
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
123
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
124
  <?php endforeach; ?>
125
  <?php endif; ?>
126
  </div>
143
  <?php endif; ?>
144
 
145
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
146
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
147
  <?php else: ?>
148
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
149
  <?php endif; ?>
154
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
155
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
156
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
157
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
158
  <?php endforeach; ?>
159
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
160
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
169
 
170
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
171
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
172
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
173
  </div>
174
  <?php endif; ?>
175
  <?php endif; ?>
209
  <?php endforeach; ?>
210
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
211
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
212
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
213
  <?php endforeach; ?>
214
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
215
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
216
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
217
  <?php endforeach; ?>
218
  <?php endif; ?>
219
  </div>
240
  <span class="cart-msrp-subtotal">--</span>
241
  <?php else: ?>
242
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
243
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
244
  <?php else: ?>
245
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
246
  <?php endif; ?>
254
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
255
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
256
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
257
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
258
  <?php endforeach; ?>
259
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
260
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
269
 
270
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
271
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
272
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
273
  </div>
274
  <?php endif; ?>
275
  <?php endif; ?>
app/design/frontend/default/iphone/template/checkout/onepage/review/item.phtml CHANGED
@@ -84,12 +84,12 @@
84
  </small>
85
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
86
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
87
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
88
  <?php endforeach; ?>
89
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
90
  <small>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
93
  <?php endforeach; ?>
94
  </small>
95
  <?php endif; ?>
@@ -111,7 +111,7 @@
111
  <?php endif; ?>
112
 
113
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
114
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
115
  <?php else: ?>
116
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
117
  <?php endif; ?>
@@ -123,7 +123,7 @@
123
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
124
  <small>
125
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
126
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
127
  <?php endforeach; ?>
128
  </small>
129
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -141,7 +141,7 @@
141
 
142
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
143
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
144
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
145
  </div>
146
  <?php endif; ?>
147
  <?php endif; ?>
@@ -173,12 +173,12 @@
173
  </small>
174
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
175
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
176
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
177
  <?php endforeach; ?>
178
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
179
  <small>
180
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
181
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
182
  <?php endforeach; ?>
183
  </small>
184
  <?php endif; ?>
@@ -202,7 +202,7 @@
202
  <?php endif; ?>
203
 
204
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
205
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
206
  <?php else: ?>
207
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
208
  <?php endif; ?>
@@ -216,7 +216,7 @@
216
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
217
  <small>
218
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
219
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
220
  <?php endforeach; ?>
221
  </small>
222
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -234,7 +234,7 @@
234
 
235
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
236
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
237
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
238
  </div>
239
  <?php endif; ?>
240
  <?php endif; ?>
84
  </small>
85
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
86
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
87
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></small></span><br />
88
  <?php endforeach; ?>
89
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
90
  <small>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
93
  <?php endforeach; ?>
94
  </small>
95
  <?php endif; ?>
111
  <?php endif; ?>
112
 
113
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
114
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
115
  <?php else: ?>
116
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
117
  <?php endif; ?>
123
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
124
  <small>
125
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
126
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
127
  <?php endforeach; ?>
128
  </small>
129
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
141
 
142
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
143
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
144
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
145
  </div>
146
  <?php endif; ?>
147
  <?php endif; ?>
173
  </small>
174
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
175
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
176
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
177
  <?php endforeach; ?>
178
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
179
  <small>
180
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
181
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
182
  <?php endforeach; ?>
183
  </small>
184
  <?php endif; ?>
202
  <?php endif; ?>
203
 
204
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
205
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
206
  <?php else: ?>
207
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
208
  <?php endif; ?>
216
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
217
  <small>
218
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
219
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
220
  <?php endforeach; ?>
221
  </small>
222
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
234
 
235
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
236
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
237
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
238
  </div>
239
  <?php endif; ?>
240
  <?php endif; ?>
app/design/frontend/default/iphone/template/customer/form/login.phtml CHANGED
@@ -39,6 +39,7 @@
39
  <?php /* Extensions placeholder */ ?>
40
  <?php echo $this->getChildHtml('customer.form.login.extra')?>
41
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
 
42
  <div class="col2-set">
43
  <div class="col-1 registered-users">
44
  <div class="content">
39
  <?php /* Extensions placeholder */ ?>
40
  <?php echo $this->getChildHtml('customer.form.login.extra')?>
41
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
42
+ <?php echo $this->getBlockHtml('formkey') ?>
43
  <div class="col2-set">
44
  <div class="col-1 registered-users">
45
  <div class="content">
app/design/frontend/default/iphone/template/downloadable/checkout/cart/item/default.phtml CHANGED
@@ -101,11 +101,11 @@
101
  <?php endforeach; ?>
102
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
103
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
105
  <?php endforeach; ?>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
107
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
108
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
109
  <?php endforeach; ?>
110
  <?php endif; ?>
111
  </div>
@@ -128,7 +128,7 @@
128
  <?php endif; ?>
129
 
130
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
131
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
132
  <?php else: ?>
133
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
134
  <?php endif; ?>
@@ -139,7 +139,7 @@
139
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
140
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
141
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
142
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
143
  <?php endforeach; ?>
144
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
145
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
@@ -154,7 +154,7 @@
154
 
155
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
156
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
157
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
158
  </div>
159
  <?php endif; ?>
160
  <?php endif; ?>
@@ -194,11 +194,11 @@
194
  <?php endforeach; ?>
195
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
196
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
197
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
198
  <?php endforeach; ?>
199
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
200
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
201
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
202
  <?php endforeach; ?>
203
  <?php endif; ?>
204
  </div>
@@ -225,7 +225,7 @@
225
  <span class="cart-msrp-subtotal">--</span>
226
  <?php else: ?>
227
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
228
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
229
  <?php else: ?>
230
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
231
  <?php endif; ?>
@@ -239,7 +239,7 @@
239
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
240
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
241
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
242
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
243
  <?php endforeach; ?>
244
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
245
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
@@ -254,7 +254,7 @@
254
 
255
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
256
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
257
- <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
258
  </div>
259
  <?php endif; ?>
260
  <?php endif; ?>
101
  <?php endforeach; ?>
102
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
103
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
105
  <?php endforeach; ?>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
107
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
108
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span>
109
  <?php endforeach; ?>
110
  <?php endif; ?>
111
  </div>
128
  <?php endif; ?>
129
 
130
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
131
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
132
  <?php else: ?>
133
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
134
  <?php endif; ?>
139
  <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
140
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
141
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
142
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
143
  <?php endforeach; ?>
144
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
145
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
154
 
155
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
156
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
157
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
158
  </div>
159
  <?php endif; ?>
160
  <?php endif; ?>
194
  <?php endforeach; ?>
195
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
196
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
197
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
198
  <?php endforeach; ?>
199
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
200
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
201
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span>
202
  <?php endforeach; ?>
203
  <?php endif; ?>
204
  </div>
225
  <span class="cart-msrp-subtotal">--</span>
226
  <?php else: ?>
227
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
228
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
229
  <?php else: ?>
230
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
231
  <?php endif; ?>
239
  <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
240
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
241
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
242
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
243
  <?php endforeach; ?>
244
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
245
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
254
 
255
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
256
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
257
+ <span class="weee"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>: <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
258
  </div>
259
  <?php endif; ?>
260
  <?php endif; ?>
app/design/frontend/default/iphone/template/downloadable/checkout/onepage/review/item.phtml CHANGED
@@ -89,12 +89,12 @@
89
  </small>
90
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
93
  <?php endforeach; ?>
94
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
95
  <small>
96
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
97
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
98
  <?php endforeach; ?>
99
  </small>
100
  <?php endif; ?>
@@ -118,7 +118,7 @@
118
  <?php endif; ?>
119
 
120
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
121
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
122
  <?php else: ?>
123
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
124
  <?php endif; ?>
@@ -130,7 +130,7 @@
130
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
131
  <small>
132
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
133
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
134
  <?php endforeach; ?>
135
  </small>
136
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -148,7 +148,7 @@
148
 
149
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
150
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
151
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
152
  </div>
153
  <?php endif; ?>
154
  <?php endif; ?>
@@ -182,12 +182,12 @@
182
  </small>
183
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
184
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
185
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
186
  <?php endforeach; ?>
187
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
188
  <small>
189
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
190
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
191
  <?php endforeach; ?>
192
  </small>
193
  <?php endif; ?>
@@ -211,7 +211,7 @@
211
  <?php endif; ?>
212
 
213
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
214
- <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
215
  <?php else: ?>
216
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
217
  <?php endif; ?>
@@ -225,7 +225,7 @@
225
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
226
  <small>
227
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
228
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
229
  <?php endforeach; ?>
230
  </small>
231
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
@@ -243,7 +243,7 @@
243
 
244
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
245
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
246
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
247
  </div>
248
  <?php endif; ?>
249
  <?php endif; ?>
89
  </small>
90
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
91
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
92
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></small></span><br />
93
  <?php endforeach; ?>
94
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
95
  <small>
96
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
97
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
98
  <?php endforeach; ?>
99
  </small>
100
  <?php endif; ?>
118
  <?php endif; ?>
119
 
120
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
121
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
122
  <?php else: ?>
123
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
124
  <?php endif; ?>
130
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
131
  <small>
132
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
133
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
134
  <?php endforeach; ?>
135
  </small>
136
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
148
 
149
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
150
  <div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
151
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
152
  </div>
153
  <?php endif; ?>
154
  <?php endif; ?>
182
  </small>
183
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
184
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
185
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
186
  <?php endforeach; ?>
187
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
188
  <small>
189
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
190
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
191
  <?php endforeach; ?>
192
  </small>
193
  <?php endif; ?>
211
  <?php endif; ?>
212
 
213
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
214
+ <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
215
  <?php else: ?>
216
  <?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
217
  <?php endif; ?>
225
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
226
  <small>
227
  <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
228
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
229
  <?php endforeach; ?>
230
  </small>
231
  <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
243
 
244
  <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
245
  <div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
246
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
247
  </div>
248
  <?php endif; ?>
249
  <?php endif; ?>
app/design/frontend/default/iphone/template/downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml CHANGED
@@ -29,27 +29,27 @@
29
  <tr id="order-item-row-<?php echo $_item->getId() ?>">
30
  <th><?php echo $this->__('Product Name') ?></th>
31
  <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
32
- <?php if($_options = $this->getItemOptions()): ?>
33
- <dl class="item-options">
34
- <?php foreach ($_options as $_option) : ?>
35
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
36
- <?php if (!$this->getPrintStatus()): ?>
37
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
38
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
39
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
40
- <div class="truncated_full_value">
41
- <dl class="item-options">
42
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44
- </dl>
45
- </div>
 
 
 
 
46
  <?php endif; ?>
47
- </dd>
48
- <?php else: ?>
49
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
50
- <?php endif; ?>
51
- <?php endforeach; ?>
52
- </dl>
53
  <?php endif; ?>
54
 
55
  <!-- downloadable -->
@@ -64,8 +64,10 @@
64
  <!-- EOF downloadable -->
65
 
66
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
67
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
68
- <br /><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="giftmessage-preview-link expand" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
 
 
69
  <?php endif; ?>
70
  </td>
71
  </tr>
@@ -77,249 +79,278 @@
77
  <th><?php echo $this->__('Price') ?></th>
78
  <td>
79
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
80
- <span class="price-excl-tax">
81
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
82
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
  <span class="cart-price">
84
  <?php endif; ?>
85
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
86
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
87
  </span>
88
  <?php endif; ?>
89
  <?php endif; ?>
90
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
91
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
92
  <?php else: ?>
93
- <span class="cart-price">
94
  <?php endif; ?>
95
 
96
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
97
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
98
- <?php else: ?>
99
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
100
- <?php endif; ?>
101
 
102
  </span>
103
 
104
 
105
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
106
 
107
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
108
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
112
- <?php endforeach; ?>
 
113
  </small>
114
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
115
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
116
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
117
  <?php endforeach; ?>
118
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
119
  <small>
120
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
121
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
122
- <?php endforeach; ?>
 
123
  </small>
124
  <?php endif; ?>
125
  </span>
126
 
127
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
128
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
129
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
 
 
130
  </span>
131
  <?php endif; ?>
132
  <?php endif; ?>
133
  </span>
134
- <br />
135
- <?php endif; ?>
136
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
137
  <span class="price-incl-tax">
138
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
139
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
140
  <span class="cart-price">
141
  <?php endif; ?>
142
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
143
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
144
  </span>
145
  <?php endif; ?>
146
  <?php endif; ?>
147
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
148
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
150
  <?php else: ?>
151
  <span class="cart-price">
152
  <?php endif; ?>
153
 
154
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
155
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
156
- <?php else: ?>
157
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
158
- <?php endif; ?>
159
 
160
  </span>
161
 
162
 
163
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
164
 
165
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
166
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
170
- <?php endforeach; ?>
 
171
  </small>
172
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
173
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
174
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
175
  <?php endforeach; ?>
176
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
177
  <small>
178
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
179
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
180
- <?php endforeach; ?>
 
181
  </small>
182
  <?php endif; ?>
183
  </span>
184
 
185
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
186
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
187
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
188
  </span>
 
189
  <?php endif; ?>
190
- <?php endif; ?>
191
  </span>
192
- <?php endif; ?>
193
  </td>
194
  </tr>
195
  <tr>
196
  <th><?php echo $this->__('Qty') ?></th>
197
- <td><?php echo $_item->getQty()*1 ?></td>
198
  </tr>
199
  <tr>
200
  <th><?php echo $this->__('Subtotal') ?></th>
201
  <td>
202
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
203
- <span class="price-excl-tax">
204
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
205
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
206
  <span class="cart-price">
207
  <?php endif; ?>
208
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
209
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
210
  </span>
211
  <?php endif; ?>
212
  <?php endif; ?>
213
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
214
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
215
  <?php else: ?>
216
- <span class="cart-price">
217
  <?php endif; ?>
218
 
219
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
220
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
221
- <?php else: ?>
222
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
223
- <?php endif; ?>
224
 
225
  </span>
226
 
227
 
228
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
229
 
230
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
231
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
235
- <?php endforeach; ?>
 
236
  </small>
237
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
239
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
240
  <?php endforeach; ?>
241
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
242
  <small>
243
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
244
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
245
- <?php endforeach; ?>
 
246
  </small>
247
  <?php endif; ?>
248
  </span>
249
 
250
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
252
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
 
 
253
  </span>
254
  <?php endif; ?>
255
  <?php endif; ?>
256
  </span>
257
- <br />
258
- <?php endif; ?>
259
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
260
  <span class="price-incl-tax">
261
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
262
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
263
  <span class="cart-price">
264
  <?php endif; ?>
265
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
266
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
267
  </span>
268
  <?php endif; ?>
269
  <?php endif; ?>
270
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
271
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
272
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
273
  <?php else: ?>
274
  <span class="cart-price">
275
  <?php endif; ?>
276
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
277
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
278
- <?php else: ?>
279
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
280
- <?php endif; ?>
281
 
282
  </span>
283
 
284
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
285
 
286
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
287
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
288
  <small>
289
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
290
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
291
- <?php endforeach; ?>
 
292
  </small>
293
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
294
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
295
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
296
  <?php endforeach; ?>
297
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
298
  <small>
299
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
300
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
301
- <?php endforeach; ?>
 
302
  </small>
303
  <?php endif; ?>
304
  </span>
305
 
306
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
307
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
308
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
309
  </span>
 
310
  <?php endif; ?>
311
- <?php endif; ?>
312
 
313
  </span>
314
- <?php endif; ?>
315
  </td>
316
  </tr>
317
- <th><?php echo $this->__('Discount Amount') ?></th>
318
- <td><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
319
  </tr>
320
  <tr>
321
  <th><?php echo $this->__('Row Total') ?></th>
322
  <td>
323
- <?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
324
  </td>
325
  </tr>
29
  <tr id="order-item-row-<?php echo $_item->getId() ?>">
30
  <th><?php echo $this->__('Product Name') ?></th>
31
  <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
32
+ <?php if ($_options = $this->getItemOptions()): ?>
33
+ <dl class="item-options">
34
+ <?php foreach ($_options as $_option) : ?>
35
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
36
+ <?php if (!$this->getPrintStatus()): ?>
37
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
38
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
39
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
40
+ <div class="truncated_full_value">
41
+ <dl class="item-options">
42
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
43
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
44
+ </dl>
45
+ </div>
46
+ <?php endif; ?>
47
+ </dd>
48
+ <?php else: ?>
49
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
50
  <?php endif; ?>
51
+ <?php endforeach; ?>
52
+ </dl>
 
 
 
 
53
  <?php endif; ?>
54
 
55
  <!-- downloadable -->
64
  <!-- EOF downloadable -->
65
 
66
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
67
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
68
+ <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
69
+ class="giftmessage-preview-link expand"
70
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
71
  <?php endif; ?>
72
  </td>
73
  </tr>
79
  <th><?php echo $this->__('Price') ?></th>
80
  <td>
81
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
82
+ <span class="price-excl-tax">
83
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
84
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
85
  <span class="cart-price">
86
  <?php endif; ?>
87
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
88
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
89
  </span>
90
  <?php endif; ?>
91
  <?php endif; ?>
92
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
93
+ <span class="cart-tax-total"
94
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
95
  <?php else: ?>
96
+ <span class="cart-price">
97
  <?php endif; ?>
98
 
99
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
100
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
101
+ <?php else: ?>
102
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
103
+ <?php endif; ?>
104
 
105
  </span>
106
 
107
 
108
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
109
 
110
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
111
+ style="display:none;">
112
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
113
  <small>
114
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
115
+ <span class="nobr"><?php echo $tax['title']; ?>
116
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
117
+ <?php endforeach; ?>
118
  </small>
119
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
120
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
121
+ <span class="nobr"><small><?php echo $tax['title']; ?>
122
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
123
  <?php endforeach; ?>
124
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
  <small>
126
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
127
+ <span class="nobr"><?php echo $tax['title']; ?>
128
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
129
+ <?php endforeach; ?>
130
  </small>
131
  <?php endif; ?>
132
  </span>
133
 
134
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
135
+ <span class="cart-tax-total"
136
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
137
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
138
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
139
  </span>
140
  <?php endif; ?>
141
  <?php endif; ?>
142
  </span>
143
+ <br/>
144
+ <?php endif; ?>
145
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
146
  <span class="price-incl-tax">
147
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
148
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
  <span class="cart-price">
150
  <?php endif; ?>
151
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
152
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
153
  </span>
154
  <?php endif; ?>
155
  <?php endif; ?>
156
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
157
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
158
+ <span class="cart-tax-total"
159
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
160
  <?php else: ?>
161
  <span class="cart-price">
162
  <?php endif; ?>
163
 
164
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
165
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
166
+ <?php else: ?>
167
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
168
+ <?php endif; ?>
169
 
170
  </span>
171
 
172
 
173
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
174
 
175
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
176
+ style="display:none;">
177
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
178
  <small>
179
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
180
+ <span class="nobr"><?php echo $tax['title']; ?>
181
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
182
+ <?php endforeach; ?>
183
  </small>
184
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
185
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
186
+ <span class="nobr"><small><?php echo $tax['title']; ?>
187
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
188
  <?php endforeach; ?>
189
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
190
  <small>
191
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
192
+ <span class="nobr"><?php echo $tax['title']; ?>
193
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
194
+ <?php endforeach; ?>
195
  </small>
196
  <?php endif; ?>
197
  </span>
198
 
199
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
200
+ <span class="cart-tax-total"
201
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
202
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
203
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
204
  </span>
205
+ <?php endif; ?>
206
  <?php endif; ?>
 
207
  </span>
208
+ <?php endif; ?>
209
  </td>
210
  </tr>
211
  <tr>
212
  <th><?php echo $this->__('Qty') ?></th>
213
+ <td><?php echo $_item->getQty() * 1 ?></td>
214
  </tr>
215
  <tr>
216
  <th><?php echo $this->__('Subtotal') ?></th>
217
  <td>
218
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
219
+ <span class="price-excl-tax">
220
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
221
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
222
  <span class="cart-price">
223
  <?php endif; ?>
224
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
225
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
226
  </span>
227
  <?php endif; ?>
228
  <?php endif; ?>
229
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
230
+ <span class="cart-tax-total"
231
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
232
  <?php else: ?>
233
+ <span class="cart-price">
234
  <?php endif; ?>
235
 
236
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
237
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
238
+ <?php else: ?>
239
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
240
+ <?php endif; ?>
241
 
242
  </span>
243
 
244
 
245
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
246
 
247
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
248
+ style="display:none;">
249
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
250
  <small>
251
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
252
+ <span class="nobr"><?php echo $tax['title']; ?>
253
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
254
+ <?php endforeach; ?>
255
  </small>
256
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
258
+ <span class="nobr"><small><?php echo $tax['title']; ?>
259
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
260
  <?php endforeach; ?>
261
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
262
  <small>
263
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
264
+ <span class="nobr"><?php echo $tax['title']; ?>
265
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
266
+ <?php endforeach; ?>
267
  </small>
268
  <?php endif; ?>
269
  </span>
270
 
271
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
272
+ <span class="cart-tax-total"
273
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
274
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
275
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
276
  </span>
277
  <?php endif; ?>
278
  <?php endif; ?>
279
  </span>
280
+ <br/>
281
+ <?php endif; ?>
282
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
283
  <span class="price-incl-tax">
284
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
285
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
  <span class="cart-price">
287
  <?php endif; ?>
288
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
289
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
290
  </span>
291
  <?php endif; ?>
292
  <?php endif; ?>
293
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
294
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
295
+ <span class="cart-tax-total"
296
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
297
  <?php else: ?>
298
  <span class="cart-price">
299
  <?php endif; ?>
300
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
301
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
302
+ <?php else: ?>
303
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
304
+ <?php endif; ?>
305
 
306
  </span>
307
 
308
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
309
 
310
+ <span class="cart-tax-info"
311
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
312
+ style="display:none;">
313
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
  <small>
315
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
316
+ <span class="nobr"><?php echo $tax['title']; ?>
317
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
318
+ <?php endforeach; ?>
319
  </small>
320
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
321
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
322
+ <span class="nobr"><small><?php echo $tax['title']; ?>
323
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
324
  <?php endforeach; ?>
325
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
326
  <small>
327
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
328
+ <span class="nobr"><?php echo $tax['title']; ?>
329
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
330
+ <?php endforeach; ?>
331
  </small>
332
  <?php endif; ?>
333
  </span>
334
 
335
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
336
+ <span class="cart-tax-total"
337
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
338
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
339
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
340
  </span>
341
+ <?php endif; ?>
342
  <?php endif; ?>
 
343
 
344
  </span>
345
+ <?php endif; ?>
346
  </td>
347
  </tr>
348
+ <th><?php echo $this->__('Discount Amount') ?></th>
349
+ <td><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
350
  </tr>
351
  <tr>
352
  <th><?php echo $this->__('Row Total') ?></th>
353
  <td>
354
+ <?php echo $_order->formatPrice($_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()) ?>
355
  </td>
356
  </tr>
app/design/frontend/default/iphone/template/downloadable/sales/order/invoice/items/renderer/downloadable.phtml CHANGED
@@ -29,28 +29,28 @@
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
  <th><?php echo $this->__('Product Name') ?></th>
31
  <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
32
- <?php if($_options = $this->getItemOptions()): ?>
33
- <dl class="item-options">
34
- <?php foreach ($_options as $_option) : ?>
35
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
36
- <?php if (!$this->getPrintStatus()): ?>
37
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
38
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
39
- <?php echo $_formatedOptionValue['value'] ?>
40
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
41
- <div class="truncated_full_value">
42
- <dl class="item-options">
43
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
44
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
45
- </dl>
46
- </div>
 
 
 
 
47
  <?php endif; ?>
48
- </dd>
49
- <?php else: ?>
50
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
51
- <?php endif; ?>
52
- <?php endforeach; ?>
53
- </dl>
54
  <?php endif; ?>
55
 
56
  <!-- downloadable -->
@@ -65,8 +65,10 @@
65
  <!-- EOF downloadable -->
66
 
67
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
68
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
69
- <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>
 
 
70
  <?php endif; ?>
71
  </td>
72
  </tr>
@@ -78,243 +80,272 @@
78
  <th class="a-right"><?php echo $this->__('Price') ?></th>
79
  <td class="a-right nowrap">
80
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
81
- <span class="price-excl-tax">
82
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
83
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
  <span class="cart-price">
85
  <?php endif; ?>
86
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
87
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
88
  </span>
89
  <?php endif; ?>
90
  <?php endif; ?>
91
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
92
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
93
  <?php else: ?>
94
- <span class="cart-price">
95
  <?php endif; ?>
96
 
97
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
98
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
99
- <?php else: ?>
100
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
101
- <?php endif; ?>
102
 
103
  </span>
104
 
105
 
106
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
107
 
108
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
109
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
110
  <small>
111
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
112
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
113
- <?php endforeach; ?>
 
114
  </small>
115
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
116
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
117
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
118
  <?php endforeach; ?>
119
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
120
  <small>
121
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
122
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
123
- <?php endforeach; ?>
 
124
  </small>
125
  <?php endif; ?>
126
  </span>
127
 
128
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
129
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
130
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
 
 
131
  </span>
132
  <?php endif; ?>
133
  <?php endif; ?>
134
  </span>
135
- <br />
136
- <?php endif; ?>
137
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
138
  <span class="price-incl-tax">
139
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
140
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
  <span class="cart-price">
142
  <?php endif; ?>
143
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
144
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
145
  </span>
146
  <?php endif; ?>
147
  <?php endif; ?>
148
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
149
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
150
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
151
  <?php else: ?>
152
  <span class="cart-price">
153
  <?php endif; ?>
154
 
155
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
156
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
157
- <?php else: ?>
158
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
159
- <?php endif; ?>
160
 
161
  </span>
162
 
163
 
164
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
165
 
166
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
167
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
168
  <small>
169
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
170
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
171
- <?php endforeach; ?>
 
172
  </small>
173
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
174
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
175
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
176
  <?php endforeach; ?>
177
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
178
  <small>
179
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
180
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
181
- <?php endforeach; ?>
 
182
  </small>
183
  <?php endif; ?>
184
  </span>
185
 
186
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
187
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
188
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
189
  </span>
 
190
  <?php endif; ?>
191
- <?php endif; ?>
192
  </span>
193
- <?php endif; ?>
194
  </td>
195
  </tr>
196
  <tr>
197
  <th class="a-center"><?php echo $this->__('Qty') ?></th>
198
- <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
199
  </tr>
200
  <tr>
201
  <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
202
  <td class="a-right nowrap">
203
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
204
- <span class="price-excl-tax">
205
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
206
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
207
  <span class="cart-price">
208
  <?php endif; ?>
209
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
210
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
211
  </span>
212
  <?php endif; ?>
213
  <?php endif; ?>
214
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
215
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
216
  <?php else: ?>
217
- <span class="cart-price">
218
  <?php endif; ?>
219
 
220
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
221
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
222
- <?php else: ?>
223
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
224
- <?php endif; ?>
225
 
226
  </span>
227
 
228
 
229
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
230
 
231
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
232
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
236
- <?php endforeach; ?>
 
237
  </small>
238
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
239
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
240
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
241
  <?php endforeach; ?>
242
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
  <small>
244
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
245
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
246
- <?php endforeach; ?>
 
247
  </small>
248
  <?php endif; ?>
249
  </span>
250
 
251
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
252
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
253
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
 
 
254
  </span>
255
  <?php endif; ?>
256
  <?php endif; ?>
257
  </span>
258
- <br />
259
- <?php endif; ?>
260
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
261
  <span class="price-incl-tax">
262
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
263
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
264
  <span class="cart-price">
265
  <?php endif; ?>
266
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
267
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
268
  </span>
269
  <?php endif; ?>
270
  <?php endif; ?>
271
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
272
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
274
  <?php else: ?>
275
  <span class="cart-price">
276
  <?php endif; ?>
277
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
278
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
279
- <?php else: ?>
280
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
281
- <?php endif; ?>
282
 
283
  </span>
284
 
285
 
286
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
287
 
288
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
289
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
293
- <?php endforeach; ?>
 
294
  </small>
295
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
296
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
297
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
298
  <?php endforeach; ?>
299
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
300
  <small>
301
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
302
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
303
- <?php endforeach; ?>
 
304
  </small>
305
  <?php endif; ?>
306
  </span>
307
 
308
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
309
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
310
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
311
  </span>
 
312
  <?php endif; ?>
313
- <?php endif; ?>
314
 
315
 
316
 
317
  </span>
318
- <?php endif; ?>
319
  </td>
320
  </tr>
29
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
30
  <th><?php echo $this->__('Product Name') ?></th>
31
  <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
32
+ <?php if ($_options = $this->getItemOptions()): ?>
33
+ <dl class="item-options">
34
+ <?php foreach ($_options as $_option) : ?>
35
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
36
+ <?php if (!$this->getPrintStatus()): ?>
37
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
38
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
39
+ <?php echo $_formatedOptionValue['value'] ?>
40
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
41
+ <div class="truncated_full_value">
42
+ <dl class="item-options">
43
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
44
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
45
+ </dl>
46
+ </div>
47
+ <?php endif; ?>
48
+ </dd>
49
+ <?php else: ?>
50
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
51
  <?php endif; ?>
52
+ <?php endforeach; ?>
53
+ </dl>
 
 
 
 
54
  <?php endif; ?>
55
 
56
  <!-- downloadable -->
65
  <!-- EOF downloadable -->
66
 
67
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
68
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
69
+ <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
70
+ class="giftmessage-preview-link expand"
71
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
72
  <?php endif; ?>
73
  </td>
74
  </tr>
80
  <th class="a-right"><?php echo $this->__('Price') ?></th>
81
  <td class="a-right nowrap">
82
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
83
+ <span class="price-excl-tax">
84
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
85
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
86
  <span class="cart-price">
87
  <?php endif; ?>
88
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
89
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
90
  </span>
91
  <?php endif; ?>
92
  <?php endif; ?>
93
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
94
+ <span class="cart-tax-total"
95
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
96
  <?php else: ?>
97
+ <span class="cart-price">
98
  <?php endif; ?>
99
 
100
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
102
+ <?php else: ?>
103
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
104
+ <?php endif; ?>
105
 
106
  </span>
107
 
108
 
109
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
110
 
111
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
112
+ style="display:none;">
113
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
114
  <small>
115
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
116
+ <span class="nobr"><?php echo $tax['title']; ?>
117
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
118
+ <?php endforeach; ?>
119
  </small>
120
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
122
+ <span class="nobr"><small><?php echo $tax['title']; ?>
123
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
124
  <?php endforeach; ?>
125
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
126
  <small>
127
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
128
+ <span class="nobr"><?php echo $tax['title']; ?>
129
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
130
+ <?php endforeach; ?>
131
  </small>
132
  <?php endif; ?>
133
  </span>
134
 
135
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
+ <span class="cart-tax-total"
137
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
138
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
139
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
140
  </span>
141
  <?php endif; ?>
142
  <?php endif; ?>
143
  </span>
144
+ <br/>
145
+ <?php endif; ?>
146
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
147
  <span class="price-incl-tax">
148
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
149
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
150
  <span class="cart-price">
151
  <?php endif; ?>
152
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
153
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
  </span>
155
  <?php endif; ?>
156
  <?php endif; ?>
157
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
158
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
159
+ <span class="cart-tax-total"
160
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
161
  <?php else: ?>
162
  <span class="cart-price">
163
  <?php endif; ?>
164
 
165
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
166
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
167
+ <?php else: ?>
168
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
169
+ <?php endif; ?>
170
 
171
  </span>
172
 
173
 
174
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
175
 
176
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
177
+ style="display:none;">
178
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
179
  <small>
180
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
181
+ <span class="nobr"><?php echo $tax['title']; ?>
182
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
183
+ <?php endforeach; ?>
184
  </small>
185
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
186
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
187
+ <span class="nobr"><small><?php echo $tax['title']; ?>
188
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
189
  <?php endforeach; ?>
190
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
191
  <small>
192
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
193
+ <span class="nobr"><?php echo $tax['title']; ?>
194
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
195
+ <?php endforeach; ?>
196
  </small>
197
  <?php endif; ?>
198
  </span>
199
 
200
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
201
+ <span class="cart-tax-total"
202
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
203
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
204
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
205
  </span>
206
+ <?php endif; ?>
207
  <?php endif; ?>
 
208
  </span>
209
+ <?php endif; ?>
210
  </td>
211
  </tr>
212
  <tr>
213
  <th class="a-center"><?php echo $this->__('Qty') ?></th>
214
+ <td class="a-center"><?php echo $_item->getQty() * 1 ?> </td>
215
  </tr>
216
  <tr>
217
  <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
218
  <td class="a-right nowrap">
219
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
220
+ <span class="price-excl-tax">
221
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
222
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
223
  <span class="cart-price">
224
  <?php endif; ?>
225
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
226
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
227
  </span>
228
  <?php endif; ?>
229
  <?php endif; ?>
230
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
231
+ <span class="cart-tax-total"
232
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
233
  <?php else: ?>
234
+ <span class="cart-price">
235
  <?php endif; ?>
236
 
237
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
238
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
239
+ <?php else: ?>
240
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
241
+ <?php endif; ?>
242
 
243
  </span>
244
 
245
 
246
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
247
 
248
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
249
+ style="display:none;">
250
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
  <small>
252
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
253
+ <span class="nobr"><?php echo $tax['title']; ?>
254
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
255
+ <?php endforeach; ?>
256
  </small>
257
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
258
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
259
+ <span class="nobr"><small><?php echo $tax['title']; ?>
260
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
261
  <?php endforeach; ?>
262
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
263
  <small>
264
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
265
+ <span class="nobr"><?php echo $tax['title']; ?>
266
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
267
+ <?php endforeach; ?>
268
  </small>
269
  <?php endif; ?>
270
  </span>
271
 
272
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
+ <span class="cart-tax-total"
274
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
275
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
276
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
277
  </span>
278
  <?php endif; ?>
279
  <?php endif; ?>
280
  </span>
281
+ <br/>
282
+ <?php endif; ?>
283
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
284
  <span class="price-incl-tax">
285
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
286
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
287
  <span class="cart-price">
288
  <?php endif; ?>
289
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
290
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
291
  </span>
292
  <?php endif; ?>
293
  <?php endif; ?>
294
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
295
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
296
+ <span class="cart-tax-total"
297
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
298
  <?php else: ?>
299
  <span class="cart-price">
300
  <?php endif; ?>
301
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
302
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
303
+ <?php else: ?>
304
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
305
+ <?php endif; ?>
306
 
307
  </span>
308
 
309
 
310
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
311
 
312
+ <span class="cart-tax-info"
313
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
314
+ style="display:none;">
315
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
316
  <small>
317
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
318
+ <span class="nobr"><?php echo $tax['title']; ?>
319
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
320
+ <?php endforeach; ?>
321
  </small>
322
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
323
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
324
+ <span class="nobr"><small><?php echo $tax['title']; ?>
325
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
326
  <?php endforeach; ?>
327
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
328
  <small>
329
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
330
+ <span class="nobr"><?php echo $tax['title']; ?>
331
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
332
+ <?php endforeach; ?>
333
  </small>
334
  <?php endif; ?>
335
  </span>
336
 
337
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
338
+ <span class="cart-tax-total"
339
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
340
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
341
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
342
  </span>
343
+ <?php endif; ?>
344
  <?php endif; ?>
 
345
 
346
 
347
 
348
  </span>
349
+ <?php endif; ?>
350
  </td>
351
  </tr>
app/design/frontend/default/iphone/template/downloadable/sales/order/items/renderer/downloadable.phtml CHANGED
@@ -25,35 +25,35 @@
25
  */
26
  ?>
27
  <?php
28
- $_item = $this->getItem();
29
- $_options = $this->getItemOptions();
30
- $links = $this->getLinks();
31
  ?>
32
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
33
  <th><?php echo $this->__('Product Name') ?></th>
34
  <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
35
- <?php if($_options): ?>
36
- <dl class="item-options">
37
- <?php foreach ($_options as $_option) : ?>
38
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
39
- <?php if (!$this->getPrintStatus()): ?>
40
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
41
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
42
- <?php echo $_formatedOptionValue['value'] ?>
43
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
44
- <div class="truncated_full_value">
45
- <dl class="item-options">
46
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
47
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
48
- </dl>
49
- </div>
 
 
 
 
50
  <?php endif; ?>
51
- </dd>
52
- <?php else: ?>
53
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
54
- <?php endif; ?>
55
- <?php endforeach; ?>
56
- </dl>
57
  <?php endif; ?>
58
 
59
  <!-- downloadable -->
@@ -68,8 +68,10 @@
68
  <!-- EOF downloadable -->
69
 
70
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
71
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
72
- <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>
 
 
73
  <?php endif; ?>
74
  </td>
75
  </tr>
@@ -81,119 +83,133 @@
81
  <th class="a-right"><?php echo $this->__('Price') ?></th>
82
  <td class="a-right nowrap">
83
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
84
- <span class="price-excl-tax">
85
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
86
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
87
  <span class="cart-price">
88
  <?php endif; ?>
89
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
90
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
91
  </span>
92
  <?php endif; ?>
93
  <?php endif; ?>
94
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
95
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
96
  <?php else: ?>
97
- <span class="cart-price">
98
  <?php endif; ?>
99
 
100
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
101
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
102
- <?php else: ?>
103
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
104
- <?php endif; ?>
105
 
106
  </span>
107
 
108
 
109
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
110
 
111
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
112
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
113
  <small>
114
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
115
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
116
- <?php endforeach; ?>
 
117
  </small>
118
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
119
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
120
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
121
  <?php endforeach; ?>
122
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
123
  <small>
124
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
125
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
126
- <?php endforeach; ?>
 
127
  </small>
128
  <?php endif; ?>
129
  </span>
130
 
131
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
132
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
133
- <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>
 
 
134
  </span>
135
  <?php endif; ?>
136
  <?php endif; ?>
137
  </span>
138
- <br />
139
- <?php endif; ?>
140
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
141
  <span class="price-incl-tax">
142
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
143
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
144
  <span class="cart-price">
145
  <?php endif; ?>
146
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
147
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
148
  </span>
149
  <?php endif; ?>
150
  <?php endif; ?>
151
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
152
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
153
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
154
  <?php else: ?>
155
  <span class="cart-price">
156
  <?php endif; ?>
157
 
158
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
159
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
160
- <?php else: ?>
161
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
162
- <?php endif; ?>
163
 
164
  </span>
165
 
166
 
167
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
168
 
169
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
170
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
171
  <small>
172
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
173
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
174
- <?php endforeach; ?>
 
175
  </small>
176
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
177
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
178
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
179
  <?php endforeach; ?>
180
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
181
  <small>
182
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
183
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
184
- <?php endforeach; ?>
 
185
  </small>
186
  <?php endif; ?>
187
  </span>
188
 
189
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
190
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
191
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
192
  </span>
 
193
  <?php endif; ?>
194
- <?php endif; ?>
195
  </span>
196
- <?php endif; ?>
197
  </td>
198
  </tr>
199
  <tr>
@@ -201,17 +217,21 @@
201
  <td class="a-right nowrap">
202
  <span class="nobr">
203
  <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
204
- <?php echo $this->__('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
205
- <?php endif; ?>
206
- <?php if ($this->getItem()->getQtyShipped() > 0): ?>
207
- <?php echo $this->__('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
208
- <?php endif; ?>
209
- <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
210
- <?php echo $this->__('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
211
- <?php endif; ?>
212
- <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
213
- <?php echo $this->__('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
214
- <?php endif; ?>
 
 
 
 
215
  </span>
216
  </td>
217
  </tr>
@@ -219,117 +239,132 @@
219
  <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
220
  <td class="a-right nowrap">
221
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
222
- <span class="price-excl-tax">
223
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
224
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
225
  <span class="cart-price">
226
  <?php endif; ?>
227
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
228
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
229
  </span>
230
  <?php endif; ?>
231
  <?php endif; ?>
232
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
233
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
234
  <?php else: ?>
235
- <span class="cart-price">
236
  <?php endif; ?>
237
 
238
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
239
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
240
- <?php else: ?>
241
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
242
- <?php endif; ?>
243
 
244
  </span>
245
 
246
 
247
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
248
 
249
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
250
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
  <small>
252
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
253
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
254
- <?php endforeach; ?>
 
255
  </small>
256
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
257
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
258
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
259
  <?php endforeach; ?>
260
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
261
  <small>
262
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
263
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
264
- <?php endforeach; ?>
 
265
  </small>
266
  <?php endif; ?>
267
  </span>
268
 
269
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
270
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
271
- <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>
 
 
272
  </span>
273
  <?php endif; ?>
274
  <?php endif; ?>
275
  </span>
276
- <br />
277
- <?php endif; ?>
278
- <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
279
  <span class="price-incl-tax">
280
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
281
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
282
  <span class="cart-price">
283
  <?php endif; ?>
284
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
285
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
  </span>
287
  <?php endif; ?>
288
  <?php endif; ?>
289
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
290
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
291
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
292
  <?php else: ?>
293
  <span class="cart-price">
294
  <?php endif; ?>
295
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
296
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
297
- <?php else: ?>
298
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
299
- <?php endif; ?>
300
 
301
  </span>
302
 
303
 
304
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
305
 
306
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
307
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
308
  <small>
309
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
310
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
311
- <?php endforeach; ?>
 
312
  </small>
313
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
315
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
316
  <?php endforeach; ?>
317
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
318
  <small>
319
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
320
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
321
- <?php endforeach; ?>
 
322
  </small>
323
  <?php endif; ?>
324
  </span>
325
 
326
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
327
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
328
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
329
  </span>
 
330
  <?php endif; ?>
331
- <?php endif; ?>
332
  </span>
333
- <?php endif; ?>
334
  </td>
335
  </tr>
25
  */
26
  ?>
27
  <?php
28
+ $_item = $this->getItem();
29
+ $_options = $this->getItemOptions();
30
+ $links = $this->getLinks();
31
  ?>
32
  <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
33
  <th><?php echo $this->__('Product Name') ?></th>
34
  <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
35
+ <?php if ($_options): ?>
36
+ <dl class="item-options">
37
+ <?php foreach ($_options as $_option) : ?>
38
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
39
+ <?php if (!$this->getPrintStatus()): ?>
40
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
41
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
42
+ <?php echo $_formatedOptionValue['value'] ?>
43
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
44
+ <div class="truncated_full_value">
45
+ <dl class="item-options">
46
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
47
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
48
+ </dl>
49
+ </div>
50
+ <?php endif; ?>
51
+ </dd>
52
+ <?php else: ?>
53
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
54
  <?php endif; ?>
55
+ <?php endforeach; ?>
56
+ </dl>
 
 
 
 
57
  <?php endif; ?>
58
 
59
  <!-- downloadable -->
68
  <!-- EOF downloadable -->
69
 
70
  <?php echo $this->escapeHtml($_item->getDescription()) ?>
71
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
72
+ <br/><a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
73
+ class="giftmessage-preview-link expand"
74
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
75
  <?php endif; ?>
76
  </td>
77
  </tr>
83
  <th class="a-right"><?php echo $this->__('Price') ?></th>
84
  <td class="a-right nowrap">
85
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
86
+ <span class="price-excl-tax">
87
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
88
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
89
  <span class="cart-price">
90
  <?php endif; ?>
91
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
92
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
93
  </span>
94
  <?php endif; ?>
95
  <?php endif; ?>
96
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
97
+ <span class="cart-tax-total"
98
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
99
  <?php else: ?>
100
+ <span class="cart-price">
101
  <?php endif; ?>
102
 
103
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
104
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
105
+ <?php else: ?>
106
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
107
+ <?php endif; ?>
108
 
109
  </span>
110
 
111
 
112
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
113
 
114
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
115
+ style="display:none;">
116
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
117
  <small>
118
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
119
+ <span class="nobr"><?php echo $tax['title']; ?>
120
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
121
+ <?php endforeach; ?>
122
  </small>
123
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
124
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
125
+ <span class="nobr"><small><?php echo $tax['title']; ?>
126
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
127
  <?php endforeach; ?>
128
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
129
  <small>
130
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
131
+ <span class="nobr"><?php echo $tax['title']; ?>
132
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
133
+ <?php endforeach; ?>
134
  </small>
135
  <?php endif; ?>
136
  </span>
137
 
138
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
139
+ <span class="cart-tax-total"
140
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
141
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
142
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
143
  </span>
144
  <?php endif; ?>
145
  <?php endif; ?>
146
  </span>
147
+ <br/>
148
+ <?php endif; ?>
149
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
150
  <span class="price-incl-tax">
151
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
152
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
153
  <span class="cart-price">
154
  <?php endif; ?>
155
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
156
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
157
  </span>
158
  <?php endif; ?>
159
  <?php endif; ?>
160
  <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
161
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
162
+ <span class="cart-tax-total"
163
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
164
  <?php else: ?>
165
  <span class="cart-price">
166
  <?php endif; ?>
167
 
168
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
169
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
170
+ <?php else: ?>
171
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
172
+ <?php endif; ?>
173
 
174
  </span>
175
 
176
 
177
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
178
 
179
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
180
+ style="display:none;">
181
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
182
  <small>
183
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
184
+ <span class="nobr"><?php echo $tax['title']; ?>
185
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
186
+ <?php endforeach; ?>
187
  </small>
188
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
189
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
190
+ <span class="nobr"><small><?php echo $tax['title']; ?>
191
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
192
  <?php endforeach; ?>
193
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
194
  <small>
195
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
196
+ <span class="nobr"><?php echo $tax['title']; ?>
197
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
198
+ <?php endforeach; ?>
199
  </small>
200
  <?php endif; ?>
201
  </span>
202
 
203
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
204
+ <span class="cart-tax-total"
205
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
206
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
207
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
208
  </span>
209
+ <?php endif; ?>
210
  <?php endif; ?>
 
211
  </span>
212
+ <?php endif; ?>
213
  </td>
214
  </tr>
215
  <tr>
217
  <td class="a-right nowrap">
218
  <span class="nobr">
219
  <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
220
+ <?php echo $this->__('Ordered'); ?>:
221
+ <strong><?php echo $this->getItem()->getQtyOrdered() * 1 ?></strong><br/>
222
+ <?php endif; ?>
223
+ <?php if ($this->getItem()->getQtyShipped() > 0): ?>
224
+ <?php echo $this->__('Shipped'); ?>:
225
+ <strong><?php echo $this->getItem()->getQtyShipped() * 1 ?></strong><br/>
226
+ <?php endif; ?>
227
+ <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
228
+ <?php echo $this->__('Canceled'); ?>:
229
+ <strong><?php echo $this->getItem()->getQtyCanceled() * 1 ?></strong><br/>
230
+ <?php endif; ?>
231
+ <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
232
+ <?php echo $this->__('Refunded'); ?>:
233
+ <strong><?php echo $this->getItem()->getQtyRefunded() * 1 ?></strong><br/>
234
+ <?php endif; ?>
235
  </span>
236
  </td>
237
  </tr>
239
  <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
240
  <td class="a-right nowrap">
241
  <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceExclTax()): ?>
242
+ <span class="price-excl-tax">
243
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
244
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
245
  <span class="cart-price">
246
  <?php endif; ?>
247
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
248
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
249
  </span>
250
  <?php endif; ?>
251
  <?php endif; ?>
252
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
+ <span class="cart-tax-total"
254
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
255
  <?php else: ?>
256
+ <span class="cart-price">
257
  <?php endif; ?>
258
 
259
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
260
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
261
+ <?php else: ?>
262
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
263
+ <?php endif; ?>
264
 
265
  </span>
266
 
267
 
268
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
269
 
270
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
271
+ style="display:none;">
272
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
273
  <small>
274
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
275
+ <span class="nobr"><?php echo $tax['title']; ?>
276
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
277
+ <?php endforeach; ?>
278
  </small>
279
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
280
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
281
+ <span class="nobr"><small><?php echo $tax['title']; ?>
282
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
283
  <?php endforeach; ?>
284
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
285
  <small>
286
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
287
+ <span class="nobr"><?php echo $tax['title']; ?>
288
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
289
+ <?php endforeach; ?>
290
  </small>
291
  <?php endif; ?>
292
  </span>
293
 
294
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
295
+ <span class="cart-tax-total"
296
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
297
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
298
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
299
  </span>
300
  <?php endif; ?>
301
  <?php endif; ?>
302
  </span>
303
+ <br/>
304
+ <?php endif; ?>
305
+ <?php if ($this->helper('tax')->displayCartBothPrices() || $this->helper('tax')->displayCartPriceInclTax()): ?>
306
  <span class="price-incl-tax">
307
  <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
308
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
309
  <span class="cart-price">
310
  <?php endif; ?>
311
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
312
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
313
  </span>
314
  <?php endif; ?>
315
  <?php endif; ?>
316
  <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
317
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
318
+ <span class="cart-tax-total"
319
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
320
  <?php else: ?>
321
  <span class="cart-price">
322
  <?php endif; ?>
323
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
324
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
325
+ <?php else: ?>
326
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
327
+ <?php endif; ?>
328
 
329
  </span>
330
 
331
 
332
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
333
 
334
+ <span class="cart-tax-info"
335
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
336
+ style="display:none;">
337
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
338
  <small>
339
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
340
+ <span class="nobr"><?php echo $tax['title']; ?>
341
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
342
+ <?php endforeach; ?>
343
  </small>
344
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
345
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
346
+ <span class="nobr"><small><?php echo $tax['title']; ?>
347
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
348
  <?php endforeach; ?>
349
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
350
  <small>
351
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
352
+ <span class="nobr"><?php echo $tax['title']; ?>
353
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
354
+ <?php endforeach; ?>
355
  </small>
356
  <?php endif; ?>
357
  </span>
358
 
359
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
360
+ <span class="cart-tax-total"
361
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
362
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
363
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
364
  </span>
365
+ <?php endif; ?>
366
  <?php endif; ?>
 
367
  </span>
368
+ <?php endif; ?>
369
  </td>
370
  </tr>
app/design/frontend/default/iphone/template/persistent/checkout/onepage/login.phtml CHANGED
@@ -38,6 +38,7 @@
38
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
39
  <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
40
  <fieldset>
 
41
  <p><?php echo $this->__('Already registered? Please log in below:') ?></p>
42
  <ul class="form-list">
43
  <li>
38
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
39
  <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
40
  <fieldset>
41
+ <?php echo $this->getBlockHtml('formkey'); ?>
42
  <p><?php echo $this->__('Already registered? Please log in below:') ?></p>
43
  <ul class="form-list">
44
  <li>
app/design/frontend/default/iphone/template/persistent/customer/form/login.phtml CHANGED
@@ -38,6 +38,7 @@
38
  </div>
39
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
40
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
 
41
  <div class="col2-set">
42
  <div class="col-1 registered-users">
43
  <div class="content">
38
  </div>
39
  <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
40
  <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
41
+ <?php echo $this->getBlockHtml('formkey') ?>
42
  <div class="col2-set">
43
  <div class="col-1 registered-users">
44
  <div class="content">
app/design/frontend/default/iphone/template/sales/order/creditmemo/items/renderer/default.phtml CHANGED
@@ -27,278 +27,309 @@
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tbody>
30
- <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
31
- <th><?php echo $this->__('Product Name') ?></th>
32
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
33
- <?php if($_options = $this->getItemOptions()): ?>
34
  <dl class="item-options">
35
- <?php foreach ($_options as $_option) : ?>
36
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
37
- <?php if (!$this->getPrintStatus()): ?>
38
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
39
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
40
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
41
- <div class="truncated_full_value">
42
- <dl class="item-options">
43
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
44
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
45
- </dl>
46
- </div>
47
- <?php endif; ?>
48
- </dd>
49
- <?php else: ?>
50
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
51
- <?php endif; ?>
52
- <?php endforeach; ?>
53
  </dl>
54
- <?php endif; ?>
55
- <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
56
- <?php if ($addInfoBlock) :?>
57
- <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
58
- <?php endif; ?>
59
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
60
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
61
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
62
- <?php endif; ?>
63
- </td>
64
- </tr>
65
- <tr>
66
- <th><?php echo $this->__('SKU') ?></th>
67
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
68
- </tr>
69
- <th class="a-right"><?php echo $this->__('Price') ?></th>
70
- <td class="a-right">
71
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
72
- <span class="price-excl-tax">
 
73
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
74
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
75
  <span class="cart-price">
76
  <?php endif; ?>
77
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
78
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
79
  </span>
80
  <?php endif; ?>
81
  <?php endif; ?>
82
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
84
  <?php else: ?>
85
- <span class="cart-price">
86
  <?php endif; ?>
87
 
88
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
89
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
90
- <?php else: ?>
91
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
92
- <?php endif; ?>
93
 
94
  </span>
95
 
96
 
97
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
98
 
99
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
100
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
104
- <?php endforeach; ?>
 
105
  </small>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
107
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
108
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
109
  <?php endforeach; ?>
110
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
111
  <small>
112
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
113
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
114
- <?php endforeach; ?>
 
115
  </small>
116
  <?php endif; ?>
117
  </span>
118
 
119
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
120
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
121
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
 
 
122
  </span>
123
- <?php endif; ?>
124
- <?php endif; ?>
125
- </span>
126
- <br />
127
  <?php endif; ?>
128
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
129
- <span class="price-incl-tax">
 
 
 
130
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
131
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
132
  <span class="cart-price">
133
  <?php endif; ?>
134
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
135
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
  </span>
137
  <?php endif; ?>
138
  <?php endif; ?>
139
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
140
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
142
  <?php else: ?>
143
- <span class="cart-price">
144
  <?php endif; ?>
145
 
146
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
147
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
148
- <?php else: ?>
149
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
150
- <?php endif; ?>
151
 
152
  </span>
153
 
154
 
155
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
156
 
157
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
158
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
162
- <?php endforeach; ?>
 
163
  </small>
164
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
165
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
166
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
167
  <?php endforeach; ?>
168
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
169
  <small>
170
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
171
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
172
- <?php endforeach; ?>
 
173
  </small>
174
  <?php endif; ?>
175
  </span>
176
 
177
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
178
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
179
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
180
  </span>
181
- <?php endif; ?>
182
  <?php endif; ?>
 
183
  </span>
184
  <?php endif; ?>
185
- </td>
186
- </tr>
187
- <tr>
188
- <th class="a-center"><?php echo $this->__('Qty') ?></th>
189
- <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
190
- </tr>
191
- <tr>
192
- <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
193
- <td class="a-right">
194
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
195
- <span class="price-excl-tax">
196
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
197
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
198
  <span class="cart-price">
199
  <?php endif; ?>
200
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
201
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
202
  </span>
203
  <?php endif; ?>
204
  <?php endif; ?>
205
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
206
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
207
  <?php else: ?>
208
- <span class="cart-price">
209
  <?php endif; ?>
210
 
211
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
212
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
213
- <?php else: ?>
214
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
215
- <?php endif; ?>
216
 
217
  </span>
218
 
219
 
220
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
221
 
222
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
223
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
224
  <small>
225
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
226
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
227
- <?php endforeach; ?>
 
228
  </small>
229
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
230
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
231
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
232
  <?php endforeach; ?>
233
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
234
  <small>
235
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
236
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
237
- <?php endforeach; ?>
 
238
  </small>
239
  <?php endif; ?>
240
  </span>
241
 
242
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
244
- <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>
 
 
245
  </span>
246
- <?php endif; ?>
247
  <?php endif; ?>
 
248
  </span>
249
- <br />
250
  <?php endif; ?>
251
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
252
- <span class="price-incl-tax">
253
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
254
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
255
  <span class="cart-price">
256
  <?php endif; ?>
257
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
258
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
259
  </span>
260
  <?php endif; ?>
261
  <?php endif; ?>
262
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
263
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
264
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
265
  <?php else: ?>
266
- <span class="cart-price">
 
 
 
 
 
267
  <?php endif; ?>
268
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
269
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
270
- <?php else: ?>
271
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
272
- <?php endif; ?>
273
 
274
  </span>
275
 
276
 
277
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
278
 
279
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
280
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
281
  <small>
282
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
283
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
284
- <?php endforeach; ?>
 
 
285
  </small>
286
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
287
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
288
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
289
  <?php endforeach; ?>
290
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
291
  <small>
292
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
293
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
294
- <?php endforeach; ?>
 
295
  </small>
296
  <?php endif; ?>
297
  </span>
298
 
299
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
300
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
301
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
302
  </span>
303
  <?php endif; ?>
304
  <?php endif; ?>
@@ -306,17 +337,17 @@
306
 
307
 
308
  </span>
309
- <?php endif; ?>
310
- </td>
311
- </tr>
312
- <tr>
313
- <th class="a-center wrap"><?php echo $this->__('Discount Amount') ?></th>
314
- <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
315
- </tr>
316
- <tr>
317
- <th class="a-right wrap"><?php echo $this->__('Row Total') ?></th>
318
- <td class="last a-right">
319
- <?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
320
- </td>
321
- </tr>
322
  </tbody>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tbody>
30
+ <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
31
+ <th><?php echo $this->__('Product Name') ?></th>
32
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
33
+ <?php if ($_options = $this->getItemOptions()): ?>
34
  <dl class="item-options">
35
+ <?php foreach ($_options as $_option) : ?>
36
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
37
+ <?php if (!$this->getPrintStatus()): ?>
38
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
39
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
40
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
41
+ <div class="truncated_full_value">
42
+ <dl class="item-options">
43
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
44
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
45
+ </dl>
46
+ </div>
47
+ <?php endif; ?>
48
+ </dd>
49
+ <?php else: ?>
50
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
51
+ <?php endif; ?>
52
+ <?php endforeach; ?>
53
  </dl>
54
+ <?php endif; ?>
55
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
56
+ <?php if ($addInfoBlock) : ?>
57
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
58
+ <?php endif; ?>
59
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
60
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
61
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link"
62
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
63
+ <?php endif; ?>
64
+ </td>
65
+ </tr>
66
+ <tr>
67
+ <th><?php echo $this->__('SKU') ?></th>
68
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
69
+ </tr>
70
+ <th class="a-right"><?php echo $this->__('Price') ?></th>
71
+ <td class="a-right">
72
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
73
+ <span class="price-excl-tax">
74
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
75
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
76
  <span class="cart-price">
77
  <?php endif; ?>
78
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
79
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
80
  </span>
81
  <?php endif; ?>
82
  <?php endif; ?>
83
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
+ <span class="cart-tax-total"
85
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
86
  <?php else: ?>
87
+ <span class="cart-price">
88
  <?php endif; ?>
89
 
90
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
91
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
92
+ <?php else: ?>
93
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
94
+ <?php endif; ?>
95
 
96
  </span>
97
 
98
 
99
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
100
 
101
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
102
+ style="display:none;">
103
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
104
  <small>
105
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
106
+ <span class="nobr"><?php echo $tax['title']; ?>
107
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
108
+ <?php endforeach; ?>
109
  </small>
110
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
111
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
112
+ <span class="nobr"><small><?php echo $tax['title']; ?>
113
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
114
  <?php endforeach; ?>
115
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
116
  <small>
117
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
118
+ <span class="nobr"><?php echo $tax['title']; ?>
119
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
120
+ <?php endforeach; ?>
121
  </small>
122
  <?php endif; ?>
123
  </span>
124
 
125
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
126
+ <span class="cart-tax-total"
127
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
128
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
129
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
130
  </span>
131
+ <?php endif; ?>
 
 
 
132
  <?php endif; ?>
133
+ </span>
134
+ <br/>
135
+ <?php endif; ?>
136
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
137
+ <span class="price-incl-tax">
138
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
139
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
140
  <span class="cart-price">
141
  <?php endif; ?>
142
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
143
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
144
  </span>
145
  <?php endif; ?>
146
  <?php endif; ?>
147
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
148
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
+ <span class="cart-tax-total"
150
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
151
  <?php else: ?>
152
+ <span class="cart-price">
153
  <?php endif; ?>
154
 
155
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
156
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
157
+ <?php else: ?>
158
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
159
+ <?php endif; ?>
160
 
161
  </span>
162
 
163
 
164
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
165
 
166
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
167
+ style="display:none;">
168
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
169
  <small>
170
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
171
+ <span class="nobr"><?php echo $tax['title']; ?>
172
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
173
+ <?php endforeach; ?>
174
  </small>
175
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
176
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
177
+ <span class="nobr"><small><?php echo $tax['title']; ?>
178
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
179
  <?php endforeach; ?>
180
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
181
  <small>
182
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
183
+ <span class="nobr"><?php echo $tax['title']; ?>
184
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
185
+ <?php endforeach; ?>
186
  </small>
187
  <?php endif; ?>
188
  </span>
189
 
190
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
191
+ <span class="cart-tax-total"
192
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
193
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
194
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
195
  </span>
 
196
  <?php endif; ?>
197
+ <?php endif; ?>
198
  </span>
199
  <?php endif; ?>
200
+ </td>
201
+ </tr>
202
+ <tr>
203
+ <th class="a-center"><?php echo $this->__('Qty') ?></th>
204
+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
205
+ </tr>
206
+ <tr>
207
+ <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
208
+ <td class="a-right">
209
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
210
+ <span class="price-excl-tax">
211
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
212
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
213
  <span class="cart-price">
214
  <?php endif; ?>
215
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
216
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
  </span>
218
  <?php endif; ?>
219
  <?php endif; ?>
220
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
221
+ <span class="cart-tax-total"
222
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
223
  <?php else: ?>
224
+ <span class="cart-price">
225
  <?php endif; ?>
226
 
227
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
228
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
229
+ <?php else: ?>
230
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
231
+ <?php endif; ?>
232
 
233
  </span>
234
 
235
 
236
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
237
 
238
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
239
+ style="display:none;">
240
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
241
  <small>
242
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
243
+ <span class="nobr"><?php echo $tax['title']; ?>
244
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
245
+ <?php endforeach; ?>
246
  </small>
247
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
249
+ <span class="nobr"><small><?php echo $tax['title']; ?>
250
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
251
  <?php endforeach; ?>
252
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
  <small>
254
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
255
+ <span class="nobr"><?php echo $tax['title']; ?>
256
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
257
+ <?php endforeach; ?>
258
  </small>
259
  <?php endif; ?>
260
  </span>
261
 
262
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
263
+ <span class="cart-tax-total"
264
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
265
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
266
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
267
  </span>
 
268
  <?php endif; ?>
269
+ <?php endif; ?>
270
  </span>
271
+ <br/>
272
  <?php endif; ?>
273
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
274
+ <span class="price-incl-tax">
275
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
276
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
277
  <span class="cart-price">
278
  <?php endif; ?>
279
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
280
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
281
  </span>
282
  <?php endif; ?>
283
  <?php endif; ?>
284
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
285
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
+ <span class="cart-tax-total"
287
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
288
  <?php else: ?>
289
+ <span class="cart-price">
290
+ <?php endif; ?>
291
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
292
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
293
+ <?php else: ?>
294
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
295
  <?php endif; ?>
 
 
 
 
 
296
 
297
  </span>
298
 
299
 
300
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
301
 
302
+ <span class="cart-tax-info"
303
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
304
+ style="display:none;">
305
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
306
  <small>
307
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
308
+ <span class="nobr"><?php echo $tax['title']; ?>
309
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
310
+
311
+ <?php endforeach; ?>
312
  </small>
313
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
314
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
315
+ <span class="nobr"><small><?php echo $tax['title']; ?>
316
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
317
  <?php endforeach; ?>
318
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
319
  <small>
320
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
321
+ <span class="nobr"><?php echo $tax['title']; ?>
322
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
323
+ <?php endforeach; ?>
324
  </small>
325
  <?php endif; ?>
326
  </span>
327
 
328
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
329
+ <span class="cart-tax-total"
330
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
331
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
332
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
333
  </span>
334
  <?php endif; ?>
335
  <?php endif; ?>
337
 
338
 
339
  </span>
340
+ <?php endif; ?>
341
+ </td>
342
+ </tr>
343
+ <tr>
344
+ <th class="a-center wrap"><?php echo $this->__('Discount Amount') ?></th>
345
+ <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
346
+ </tr>
347
+ <tr>
348
+ <th class="a-right wrap"><?php echo $this->__('Row Total') ?></th>
349
+ <td class="last a-right">
350
+ <?php echo $_order->formatPrice($_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()) ?>
351
+ </td>
352
+ </tr>
353
  </tbody>
app/design/frontend/default/iphone/template/sales/order/invoice/items/renderer/default.phtml CHANGED
@@ -27,278 +27,308 @@
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tbody>
30
- <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
31
- <th><?php echo $this->__('Product Name') ?></th>
32
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
33
- <?php if($_options = $this->getItemOptions()): ?>
34
  <dl class="item-options">
35
- <?php foreach ($_options as $_option) : ?>
36
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
37
- <?php if (!$this->getPrintStatus()): ?>
38
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
39
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
40
- <?php echo $_formatedOptionValue['value'] ?>
41
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
42
- <div class="truncated_full_value">
43
- <dl class="item-options">
44
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
45
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
46
- </dl>
47
- </div>
48
- <?php endif; ?>
49
- </dd>
50
- <?php else: ?>
51
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
52
- <?php endif; ?>
53
- <?php endforeach; ?>
54
  </dl>
55
- <?php endif; ?>
56
- <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
57
- <?php if ($addInfoBlock) :?>
58
- <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
59
- <?php endif; ?>
60
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
61
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
62
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
63
- <?php endif; ?>
64
- </td>
65
- </tr>
66
- <th><?php echo $this->__('SKU') ?></th>
67
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
68
- </tr>
69
- <th class="a-right"><?php echo $this->__('Price') ?></th>
70
- <td class="a-right">
71
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
72
- <span class="price-excl-tax">
 
73
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
74
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
75
  <span class="cart-price">
76
  <?php endif; ?>
77
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
78
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
79
  </span>
80
  <?php endif; ?>
81
  <?php endif; ?>
82
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
83
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
84
  <?php else: ?>
85
- <span class="cart-price">
86
  <?php endif; ?>
87
 
88
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
89
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
90
- <?php else: ?>
91
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
92
- <?php endif; ?>
93
 
94
  </span>
95
 
96
 
97
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
98
 
99
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
100
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
104
- <?php endforeach; ?>
 
105
  </small>
106
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
107
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
108
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
109
  <?php endforeach; ?>
110
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
111
  <small>
112
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
113
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
114
- <?php endforeach; ?>
 
115
  </small>
116
  <?php endif; ?>
117
  </span>
118
 
119
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
120
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
121
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
 
 
122
  </span>
123
- <?php endif; ?>
124
- <?php endif; ?>
125
- </span>
126
- <br />
127
  <?php endif; ?>
128
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
129
- <span class="price-incl-tax">
 
 
 
130
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
131
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
132
  <span class="cart-price">
133
  <?php endif; ?>
134
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
135
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
136
  </span>
137
  <?php endif; ?>
138
  <?php endif; ?>
139
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
140
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
142
  <?php else: ?>
143
- <span class="cart-price">
144
  <?php endif; ?>
145
 
146
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
147
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
148
- <?php else: ?>
149
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
150
- <?php endif; ?>
151
 
152
  </span>
153
 
154
 
155
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
156
 
157
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
158
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
162
- <?php endforeach; ?>
 
163
  </small>
164
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
165
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
166
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
167
  <?php endforeach; ?>
168
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
169
  <small>
170
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
171
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
172
- <?php endforeach; ?>
 
173
  </small>
174
  <?php endif; ?>
175
  </span>
176
 
177
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
178
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
179
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
180
  </span>
181
- <?php endif; ?>
182
  <?php endif; ?>
 
183
  </span>
184
  <?php endif; ?>
185
- </td>
186
- </tr>
187
- <tr>
188
- <th class="a-center"><span class="nobr"><?php echo $this->__('Qty Invoiced') ?></span></th>
189
- <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
190
- </tr>
191
- <tr>
192
- <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
193
- <td class="a-right">
194
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
195
- <span class="price-excl-tax">
196
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
197
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
198
  <span class="cart-price">
199
  <?php endif; ?>
200
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
201
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
202
  </span>
203
  <?php endif; ?>
204
  <?php endif; ?>
205
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
206
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
207
  <?php else: ?>
208
- <span class="cart-price">
209
  <?php endif; ?>
210
 
211
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
212
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
213
- <?php else: ?>
214
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
215
- <?php endif; ?>
216
 
217
  </span>
218
 
219
 
220
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
221
 
222
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
223
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
224
  <small>
225
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
226
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
227
- <?php endforeach; ?>
 
228
  </small>
229
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
230
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
231
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
232
  <?php endforeach; ?>
233
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
234
  <small>
235
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
236
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
237
- <?php endforeach; ?>
 
238
  </small>
239
  <?php endif; ?>
240
  </span>
241
 
242
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
244
- <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>
 
 
245
  </span>
246
- <?php endif; ?>
247
  <?php endif; ?>
 
248
  </span>
249
- <br />
250
  <?php endif; ?>
251
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
252
- <span class="price-incl-tax">
253
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
254
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
255
  <span class="cart-price">
256
  <?php endif; ?>
257
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
258
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
259
  </span>
260
  <?php endif; ?>
261
  <?php endif; ?>
262
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
263
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
264
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
265
  <?php else: ?>
266
- <span class="cart-price">
 
 
 
 
 
267
  <?php endif; ?>
268
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
269
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
270
- <?php else: ?>
271
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
272
- <?php endif; ?>
273
 
274
  </span>
275
 
276
 
277
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
278
 
279
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
 
280
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
281
  <small>
282
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
283
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
284
- <?php endforeach; ?>
 
285
  </small>
286
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
287
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
288
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
289
  <?php endforeach; ?>
290
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
291
  <small>
292
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
293
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
294
- <?php endforeach; ?>
 
295
  </small>
296
  <?php endif; ?>
297
  </span>
298
 
299
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
300
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
301
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
302
  </span>
303
  <?php endif; ?>
304
  <?php endif; ?>
@@ -306,7 +336,7 @@
306
 
307
 
308
  </span>
309
- <?php endif; ?>
310
- </td>
311
- </tr>
312
  </tbody>
27
  <?php $_item = $this->getItem() ?>
28
  <?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
29
  <tbody>
30
+ <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
31
+ <th><?php echo $this->__('Product Name') ?></th>
32
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
33
+ <?php if ($_options = $this->getItemOptions()): ?>
34
  <dl class="item-options">
35
+ <?php foreach ($_options as $_option) : ?>
36
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
37
+ <?php if (!$this->getPrintStatus()): ?>
38
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
39
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
40
+ <?php echo $_formatedOptionValue['value'] ?>
41
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
42
+ <div class="truncated_full_value">
43
+ <dl class="item-options">
44
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
45
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
46
+ </dl>
47
+ </div>
48
+ <?php endif; ?>
49
+ </dd>
50
+ <?php else: ?>
51
+ <dd><?php echo $this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
52
+ <?php endif; ?>
53
+ <?php endforeach; ?>
54
  </dl>
55
+ <?php endif; ?>
56
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
57
+ <?php if ($addInfoBlock) : ?>
58
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
59
+ <?php endif; ?>
60
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
61
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
62
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link"
63
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
64
+ <?php endif; ?>
65
+ </td>
66
+ </tr>
67
+ <th><?php echo $this->__('SKU') ?></th>
68
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
69
+ </tr>
70
+ <th class="a-right"><?php echo $this->__('Price') ?></th>
71
+ <td class="a-right">
72
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
73
+ <span class="price-excl-tax">
74
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
75
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
76
  <span class="cart-price">
77
  <?php endif; ?>
78
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
79
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
80
  </span>
81
  <?php endif; ?>
82
  <?php endif; ?>
83
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
+ <span class="cart-tax-total"
85
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
86
  <?php else: ?>
87
+ <span class="cart-price">
88
  <?php endif; ?>
89
 
90
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
91
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
92
+ <?php else: ?>
93
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
94
+ <?php endif; ?>
95
 
96
  </span>
97
 
98
 
99
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
100
 
101
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
102
+ style="display:none;">
103
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
104
  <small>
105
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
106
+ <span class="nobr"><?php echo $tax['title']; ?>
107
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
108
+ <?php endforeach; ?>
109
  </small>
110
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
111
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
112
+ <span class="nobr"><small><?php echo $tax['title']; ?>
113
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
114
  <?php endforeach; ?>
115
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
116
  <small>
117
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
118
+ <span class="nobr"><?php echo $tax['title']; ?>
119
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
120
+ <?php endforeach; ?>
121
  </small>
122
  <?php endif; ?>
123
  </span>
124
 
125
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
126
+ <span class="cart-tax-total"
127
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
128
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
129
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
130
  </span>
131
+ <?php endif; ?>
 
 
 
132
  <?php endif; ?>
133
+ </span>
134
+ <br/>
135
+ <?php endif; ?>
136
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
137
+ <span class="price-incl-tax">
138
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
139
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
140
  <span class="cart-price">
141
  <?php endif; ?>
142
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
143
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
144
  </span>
145
  <?php endif; ?>
146
  <?php endif; ?>
147
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
148
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
+ <span class="cart-tax-total"
150
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
151
  <?php else: ?>
152
+ <span class="cart-price">
153
  <?php endif; ?>
154
 
155
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
156
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
157
+ <?php else: ?>
158
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
159
+ <?php endif; ?>
160
 
161
  </span>
162
 
163
 
164
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
165
 
166
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
167
+ style="display:none;">
168
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
169
  <small>
170
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
171
+ <span class="nobr"><?php echo $tax['title']; ?>
172
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
173
+ <?php endforeach; ?>
174
  </small>
175
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
176
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
177
+ <span class="nobr"><small><?php echo $tax['title']; ?>
178
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
179
  <?php endforeach; ?>
180
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
181
  <small>
182
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
183
+ <span class="nobr"><?php echo $tax['title']; ?>
184
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
185
+ <?php endforeach; ?>
186
  </small>
187
  <?php endif; ?>
188
  </span>
189
 
190
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
191
+ <span class="cart-tax-total"
192
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
193
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
194
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
195
  </span>
 
196
  <?php endif; ?>
197
+ <?php endif; ?>
198
  </span>
199
  <?php endif; ?>
200
+ </td>
201
+ </tr>
202
+ <tr>
203
+ <th class="a-center"><span class="nobr"><?php echo $this->__('Qty Invoiced') ?></span></th>
204
+ <td class="a-center"><?php echo $_item->getQty() * 1 ?> </td>
205
+ </tr>
206
+ <tr>
207
+ <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
208
+ <td class="a-right">
209
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
210
+ <span class="price-excl-tax">
211
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
212
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
213
  <span class="cart-price">
214
  <?php endif; ?>
215
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
216
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
  </span>
218
  <?php endif; ?>
219
  <?php endif; ?>
220
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
221
+ <span class="cart-tax-total"
222
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
223
  <?php else: ?>
224
+ <span class="cart-price">
225
  <?php endif; ?>
226
 
227
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
228
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
229
+ <?php else: ?>
230
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
231
+ <?php endif; ?>
232
 
233
  </span>
234
 
235
 
236
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
237
 
238
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
239
+ style="display:none;">
240
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
241
  <small>
242
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
243
+ <span class="nobr"><?php echo $tax['title']; ?>
244
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
245
+ <?php endforeach; ?>
246
  </small>
247
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
248
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
249
+ <span class="nobr"><small><?php echo $tax['title']; ?>
250
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
251
  <?php endforeach; ?>
252
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
  <small>
254
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
255
+ <span class="nobr"><?php echo $tax['title']; ?>
256
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
257
+ <?php endforeach; ?>
258
  </small>
259
  <?php endif; ?>
260
  </span>
261
 
262
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
263
+ <span class="cart-tax-total"
264
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
265
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
266
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
267
  </span>
 
268
  <?php endif; ?>
269
+ <?php endif; ?>
270
  </span>
271
+ <br/>
272
  <?php endif; ?>
273
  <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
274
+ <span class="price-incl-tax">
275
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
276
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
277
  <span class="cart-price">
278
  <?php endif; ?>
279
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
280
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
281
  </span>
282
  <?php endif; ?>
283
  <?php endif; ?>
284
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
285
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
+ <span class="cart-tax-total"
287
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
288
  <?php else: ?>
289
+ <span class="cart-price">
290
+ <?php endif; ?>
291
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
292
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
293
+ <?php else: ?>
294
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
295
  <?php endif; ?>
 
 
 
 
 
296
 
297
  </span>
298
 
299
 
300
  <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
301
 
302
+ <span class="cart-tax-info"
303
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
304
+ style="display:none;">
305
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
306
  <small>
307
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
308
+ <span class="nobr"><?php echo $tax['title']; ?>
309
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
310
+ <?php endforeach; ?>
311
  </small>
312
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
313
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
314
+ <span class="nobr"><small><?php echo $tax['title']; ?>
315
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
316
  <?php endforeach; ?>
317
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
318
  <small>
319
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
320
+ <span class="nobr"><?php echo $tax['title']; ?>
321
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
322
+ <?php endforeach; ?>
323
  </small>
324
  <?php endif; ?>
325
  </span>
326
 
327
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
328
+ <span class="cart-tax-total"
329
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
330
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
331
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
332
  </span>
333
  <?php endif; ?>
334
  <?php endif; ?>
336
 
337
 
338
  </span>
339
+ <?php endif; ?>
340
+ </td>
341
+ </tr>
342
  </tbody>
app/design/frontend/default/iphone/template/sales/order/items/renderer/default.phtml CHANGED
@@ -25,307 +25,340 @@
25
  */
26
  ?>
27
  <?php
28
- $_item = $this->getItem();
29
- $_options = $this->getItemOptions();
30
  ?>
31
  <tbody>
32
- <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
33
- <th><?php echo $this->__('Product Name') ?></th>
34
- <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
35
- <?php if($_options): ?>
36
  <dl class="item-options">
37
- <?php foreach ($_options as $_option) : ?>
38
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
39
- <?php if (!$this->getPrintStatus()): ?>
40
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
41
- <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
42
- <?php echo $_formatedOptionValue['value'] ?>
43
- <?php if (isset($_formatedOptionValue['full_view'])): ?>
44
- <div class="truncated_full_value">
45
- <dl class="item-options">
46
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
47
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
48
- </dl>
49
- </div>
50
- <?php endif; ?>
51
- </dd>
52
- <?php else: ?>
53
- <dd>
54
- <?php echo nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
55
- </dd>
56
- <?php endif; ?>
57
- <?php endforeach; ?>
58
  </dl>
59
- <?php endif; ?>
60
- <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
61
- <?php if ($addtInfoBlock) :?>
62
- <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
63
- <?php endif; ?>
64
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
65
- <?php if($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
66
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
67
- <?php endif; ?>
68
- </td>
69
- </tr>
70
- <tr>
71
- <th><?php echo $this->__('SKU') ?></th>
72
- <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
73
- </tr>
74
- <th class="a-right"><?php echo $this->__('Price') ?></th>
75
- <td class="a-right">
76
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
77
- <span class="price-excl-tax">
 
78
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
79
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
80
  <span class="cart-price">
81
  <?php endif; ?>
82
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
83
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
84
  </span>
85
  <?php endif; ?>
86
  <?php endif; ?>
87
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
88
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
89
  <?php else: ?>
90
- <span class="cart-price">
91
  <?php endif; ?>
92
 
93
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
94
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
95
- <?php else: ?>
96
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
97
- <?php endif; ?>
98
 
99
  </span>
100
 
101
 
102
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
103
 
104
- <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
105
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
106
  <small>
107
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
108
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
109
- <?php endforeach; ?>
 
110
  </small>
111
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
112
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
113
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
114
  <?php endforeach; ?>
115
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
116
  <small>
117
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
118
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
119
- <?php endforeach; ?>
 
120
  </small>
121
  <?php endif; ?>
122
  </span>
123
 
124
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
125
- <span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
126
- <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>
 
 
127
  </span>
128
- <?php endif; ?>
129
- <?php endif; ?>
130
- </span>
131
- <br />
132
  <?php endif; ?>
133
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
134
- <span class="price-incl-tax">
 
 
 
135
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
136
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
137
  <span class="cart-price">
138
  <?php endif; ?>
139
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
140
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
141
  </span>
142
  <?php endif; ?>
143
  <?php endif; ?>
144
- <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
145
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
146
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
147
  <?php else: ?>
148
- <span class="cart-price">
149
  <?php endif; ?>
150
 
151
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
152
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
153
- <?php else: ?>
154
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
155
- <?php endif; ?>
156
 
157
  </span>
158
 
159
 
160
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
161
 
162
- <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
163
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, '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']); ?></span>
167
- <?php endforeach; ?>
 
168
  </small>
169
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
170
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
171
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
 
172
  <?php endforeach; ?>
173
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
174
  <small>
175
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
176
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
177
- <?php endforeach; ?>
 
178
  </small>
179
  <?php endif; ?>
180
  </span>
181
 
182
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
183
- <span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
184
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
 
 
185
  </span>
186
- <?php endif; ?>
187
  <?php endif; ?>
 
188
  </span>
189
  <?php endif; ?>
190
- </td>
191
- </tr>
192
- <tr>
193
- <th class="a-center"><?php echo $this->__('Qty') ?></th>
194
- <td class="a-right">
195
  <span class="nobr">
196
  <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
197
- <?php echo $this->__('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
198
- <?php endif; ?>
199
- <?php if ($this->getItem()->getQtyShipped() > 0): ?>
200
- <?php echo $this->__('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
201
- <?php endif; ?>
202
- <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
203
- <?php echo $this->__('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
204
- <?php endif; ?>
205
- <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
206
- <?php echo $this->__('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
207
- <?php endif; ?>
 
 
 
 
208
  </span>
209
- </td>
210
- </tr>
211
- <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
212
- <td class="a-right">
213
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
214
- <span class="price-excl-tax">
215
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
216
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
217
  <span class="cart-price">
218
  <?php endif; ?>
219
- <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
220
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
221
  </span>
222
  <?php endif; ?>
223
  <?php endif; ?>
224
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
225
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
226
  <?php else: ?>
227
- <span class="cart-price">
228
  <?php endif; ?>
229
 
230
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
231
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
232
- <?php else: ?>
233
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
234
- <?php endif; ?>
235
 
236
  </span>
237
 
238
 
239
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
240
 
241
- <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
242
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
243
  <small>
244
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
245
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
246
- <?php endforeach; ?>
 
247
  </small>
248
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
249
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
250
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
251
  <?php endforeach; ?>
252
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
253
  <small>
254
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
255
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
256
- <?php endforeach; ?>
 
257
  </small>
258
  <?php endif; ?>
259
  </span>
260
 
261
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
262
- <span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
263
- <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>
 
 
264
  </span>
265
- <?php endif; ?>
266
- <?php endif; ?>
267
- </span>
268
- <br />
269
  <?php endif; ?>
270
- <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
271
- <span class="price-incl-tax">
 
 
 
272
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
273
- <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
274
  <span class="cart-price">
275
  <?php endif; ?>
276
- <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
277
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
278
  </span>
279
  <?php endif; ?>
280
  <?php endif; ?>
281
- <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
282
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
283
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
 
284
  <?php else: ?>
285
- <span class="cart-price">
 
 
 
 
 
286
  <?php endif; ?>
287
- <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
288
- <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
289
- <?php else: ?>
290
- <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
291
- <?php endif; ?>
292
 
293
  </span>
294
 
295
 
296
- <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
297
 
298
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
 
299
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
300
  <small>
301
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
302
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
303
- <?php endforeach; ?>
 
304
  </small>
305
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
306
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
307
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
 
308
  <?php endforeach; ?>
309
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
310
  <small>
311
- <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
312
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
313
- <?php endforeach; ?>
 
314
  </small>
315
  <?php endif; ?>
316
  </span>
317
 
318
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
319
- <span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
320
- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
 
 
321
  </span>
322
- <?php endif; ?>
323
  <?php endif; ?>
 
324
 
325
 
326
 
327
  </span>
328
  <?php endif; ?>
329
- </td>
330
- </tr>
331
  </tbody>
25
  */
26
  ?>
27
  <?php
28
+ $_item = $this->getItem();
29
+ $_options = $this->getItemOptions();
30
  ?>
31
  <tbody>
32
+ <tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
33
+ <th><?php echo $this->__('Product Name') ?></th>
34
+ <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
35
+ <?php if ($_options): ?>
36
  <dl class="item-options">
37
+ <?php foreach ($_options as $_option) : ?>
38
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
39
+ <?php if (!$this->getPrintStatus()): ?>
40
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
41
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>>
42
+ <?php echo $_formatedOptionValue['value'] ?>
43
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
44
+ <div class="truncated_full_value">
45
+ <dl class="item-options">
46
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
47
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
48
+ </dl>
49
+ </div>
50
+ <?php endif; ?>
51
+ </dd>
52
+ <?php else: ?>
53
+ <dd>
54
+ <?php echo nl2br($this->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
55
+ </dd>
56
+ <?php endif; ?>
57
+ <?php endforeach; ?>
58
  </dl>
59
+ <?php endif; ?>
60
+ <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
61
+ <?php if ($addtInfoBlock) : ?>
62
+ <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
63
+ <?php endif; ?>
64
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
65
+ <?php if ($this->helper('giftmessage/message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
66
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link"
67
+ onclick="return giftMessageToogle('<?php echo $_item->getId() ?>')"><?php echo $this->__('Gift Message') ?></a>
68
+ <?php endif; ?>
69
+ </td>
70
+ </tr>
71
+ <tr>
72
+ <th><?php echo $this->__('SKU') ?></th>
73
+ <td><?php echo $this->escapeHtml(Mage::helper('core/string')->splitInjection($this->getSku())) ?></td>
74
+ </tr>
75
+ <th class="a-right"><?php echo $this->__('Price') ?></th>
76
+ <td class="a-right">
77
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
78
+ <span class="price-excl-tax">
79
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
80
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
81
  <span class="cart-price">
82
  <?php endif; ?>
83
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
84
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
85
  </span>
86
  <?php endif; ?>
87
  <?php endif; ?>
88
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
89
+ <span class="cart-tax-total"
90
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
91
  <?php else: ?>
92
+ <span class="cart-price">
93
  <?php endif; ?>
94
 
95
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
96
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?>
97
+ <?php else: ?>
98
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
99
+ <?php endif; ?>
100
 
101
  </span>
102
 
103
 
104
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
105
 
106
+ <span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
107
+ style="display:none;">
108
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
109
  <small>
110
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
111
+ <span class="nobr"><?php echo $tax['title']; ?>
112
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
113
+ <?php endforeach; ?>
114
  </small>
115
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
116
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
117
+ <span class="nobr"><small><?php echo $tax['title']; ?>
118
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></small></span>
119
  <?php endforeach; ?>
120
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
121
  <small>
122
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
123
+ <span class="nobr"><?php echo $tax['title']; ?>
124
+ : <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
125
+ <?php endforeach; ?>
126
  </small>
127
  <?php endif; ?>
128
  </span>
129
 
130
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
131
+ <span class="cart-tax-total"
132
+ onclick="taxToggle('eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
133
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
134
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice() + $this->getItem()->getWeeeTaxAppliedAmount() + $this->getItem()->getWeeeTaxDisposition()); ?></span>
135
  </span>
136
+ <?php endif; ?>
 
 
 
137
  <?php endif; ?>
138
+ </span>
139
+ <br/>
140
+ <?php endif; ?>
141
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
142
+ <span class="price-incl-tax">
143
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
144
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
145
  <span class="cart-price">
146
  <?php endif; ?>
147
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
148
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
149
  </span>
150
  <?php endif; ?>
151
  <?php endif; ?>
152
+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($this->getItem()); ?>
153
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
154
+ <span class="cart-tax-total"
155
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
156
  <?php else: ?>
157
+ <span class="cart-price">
158
  <?php endif; ?>
159
 
160
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
161
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
162
+ <?php else: ?>
163
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxDisposition()) ?>
164
+ <?php endif; ?>
165
 
166
  </span>
167
 
168
 
169
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
170
 
171
+ <span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
172
+ style="display:none;">
173
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
174
  <small>
175
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
176
+ <span class="nobr"><?php echo $tax['title']; ?>
177
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
178
+ <?php endforeach; ?>
179
  </small>
180
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
181
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
182
+ <span class="nobr"><small><?php echo $tax['title']; ?>
183
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
184
  <?php endforeach; ?>
185
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
186
  <small>
187
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
188
+ <span class="nobr"><?php echo $tax['title']; ?>
189
+ : <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
190
+ <?php endforeach; ?>
191
  </small>
192
  <?php endif; ?>
193
  </span>
194
 
195
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
196
+ <span class="cart-tax-total"
197
+ onclick="taxToggle('unit-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
198
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
199
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
200
  </span>
 
201
  <?php endif; ?>
202
+ <?php endif; ?>
203
  </span>
204
  <?php endif; ?>
205
+ </td>
206
+ </tr>
207
+ <tr>
208
+ <th class="a-center"><?php echo $this->__('Qty') ?></th>
209
+ <td class="a-right">
210
  <span class="nobr">
211
  <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
212
+ <?php echo $this->__('Ordered'); ?>:
213
+ <strong><?php echo $this->getItem()->getQtyOrdered() * 1 ?></strong><br/>
214
+ <?php endif; ?>
215
+ <?php if ($this->getItem()->getQtyShipped() > 0): ?>
216
+ <?php echo $this->__('Shipped'); ?>:
217
+ <strong><?php echo $this->getItem()->getQtyShipped() * 1 ?></strong><br/>
218
+ <?php endif; ?>
219
+ <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
220
+ <?php echo $this->__('Canceled'); ?>:
221
+ <strong><?php echo $this->getItem()->getQtyCanceled() * 1 ?></strong><br/>
222
+ <?php endif; ?>
223
+ <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
224
+ <?php echo $this->__('Refunded'); ?>:
225
+ <strong><?php echo $this->getItem()->getQtyRefunded() * 1 ?></strong><br/>
226
+ <?php endif; ?>
227
  </span>
228
+ </td>
229
+ </tr>
230
+ <th class="a-right"><?php echo $this->__('Subtotal') ?></th>
231
+ <td class="a-right">
232
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
233
+ <span class="price-excl-tax">
234
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
235
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
236
  <span class="cart-price">
237
  <?php endif; ?>
238
+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
239
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
240
  </span>
241
  <?php endif; ?>
242
  <?php endif; ?>
243
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
244
+ <span class="cart-tax-total"
245
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
246
  <?php else: ?>
247
+ <span class="cart-price">
248
  <?php endif; ?>
249
 
250
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
251
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
252
+ <?php else: ?>
253
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
254
+ <?php endif; ?>
255
 
256
  </span>
257
 
258
 
259
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
260
 
261
+ <span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
262
+ 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']; ?>
267
+ : <?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']; ?>
273
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></small></span>
274
  <?php endforeach; ?>
275
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
276
  <small>
277
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
278
+ <span class="nobr"><?php echo $tax['title']; ?>
279
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
280
+ <?php endforeach; ?>
281
  </small>
282
  <?php endif; ?>
283
  </span>
284
 
285
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
286
+ <span class="cart-tax-total"
287
+ onclick="taxToggle('esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
288
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
289
+ :<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?></span>
290
  </span>
291
+ <?php endif; ?>
 
 
 
292
  <?php endif; ?>
293
+ </span>
294
+ <br/>
295
+ <?php endif; ?>
296
+ <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
297
+ <span class="price-incl-tax">
298
  <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
299
+ <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
300
  <span class="cart-price">
301
  <?php endif; ?>
302
+ <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
303
  <?php if (!Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
304
  </span>
305
  <?php endif; ?>
306
  <?php endif; ?>
307
+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($this->getItem()); ?>
308
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
309
+ <span class="cart-tax-total"
310
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
311
  <?php else: ?>
312
+ <span class="cart-price">
313
+ <?php endif; ?>
314
+ <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
315
+ <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
316
+ <?php else: ?>
317
+ <?php echo $this->getOrder()->formatPrice($_incl - $this->getItem()->getWeeeTaxRowDisposition()) ?>
318
  <?php endif; ?>
 
 
 
 
 
319
 
320
  </span>
321
 
322
 
323
+ <?php if (Mage::helper('weee')->getApplied($this->getItem())): ?>
324
 
325
+ <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
326
+ style="display:none;">
327
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
328
  <small>
329
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
330
+ <span class="nobr"><?php echo $tax['title']; ?>
331
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
332
+ <?php endforeach; ?>
333
  </small>
334
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
335
  <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
336
+ <span class="nobr"><small><?php echo $tax['title']; ?>
337
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
338
  <?php endforeach; ?>
339
  <?php elseif (Mage::helper('weee')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
340
  <small>
341
+ <?php foreach (Mage::helper('weee')->getApplied($this->getItem()) as $tax): ?>
342
+ <span class="nobr"><?php echo $tax['title']; ?>
343
+ : <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
344
+ <?php endforeach; ?>
345
  </small>
346
  <?php endif; ?>
347
  </span>
348
 
349
  <?php if (Mage::helper('weee')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
350
+ <span class="cart-tax-total"
351
+ onclick="taxToggle('subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>', this, 'cart-tax-total-expanded');">
352
+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>
353
+ :<br/> <?php echo $this->getOrder()->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
354
  </span>
 
355
  <?php endif; ?>
356
+ <?php endif; ?>
357
 
358
 
359
 
360
  </span>
361
  <?php endif; ?>
362
+ </td>
363
+ </tr>
364
  </tbody>
app/design/frontend/default/iphone/template/wishlist/view.phtml CHANGED
@@ -48,21 +48,37 @@
48
  </fieldset>
49
  </form>
50
 
 
 
 
 
 
 
 
 
51
  <script type="text/javascript">
52
- //<![CDATA[
53
- var wishlistForm = new Validation($('wishlist-view-form'));
54
- function addAllWItemsToCart() {
55
- var url = '<?php echo $this->getUrl('*/*/allcart', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>';
56
- var separator = (url.indexOf('?') >= 0) ? '&' : '?';
57
- $$('#wishlist-view-form .qty').each(
58
- function (input, index) {
59
- url += separator + input.name + '=' + encodeURIComponent(input.value);
60
- separator = '&';
61
- }
62
- );
63
- setLocation(url);
64
- }
65
- //]]>
 
 
 
 
 
 
 
 
66
  </script>
67
  </div>
68
  <?php echo $this->getChildHtml('bottom'); ?>
48
  </fieldset>
49
  </form>
50
 
51
+ <form id="wishlist-allcart-form" action="<?php echo $this->getUrl('*/*/allcart') ?>" method="post">
52
+ <?php echo $this->getBlockHtml('formkey') ?>
53
+ <div class="no-display">
54
+ <input type="hidden" name="wishlist_id" id="wishlist_id" value="<?php echo $this->getWishlistInstance()->getId() ?>" />
55
+ <input type="hidden" name="qty" id="qty" value="" />
56
+ </div>
57
+ </form>
58
+
59
  <script type="text/javascript">
60
+ //<![CDATA[
61
+ var wishlistForm = new Validation($('wishlist-view-form'));
62
+ var wishlistAllCartForm = new Validation($('wishlist-allcart-form'));
63
+
64
+ function calculateQty() {
65
+ var itemQtys = new Array();
66
+ $$('#wishlist-view-form .qty').each(
67
+ function (input, index) {
68
+ var idxStr = input.name;
69
+ var idx = idxStr.replace( /[^\d.]/g, '' );
70
+ itemQtys[idx] = input.value;
71
+ }
72
+ );
73
+
74
+ $$('#qty')[0].value = JSON.stringify(itemQtys);
75
+ }
76
+
77
+ function addAllWItemsToCart() {
78
+ calculateQty();
79
+ wishlistAllCartForm.form.submit();
80
+ }
81
+ //]]>
82
  </script>
83
  </div>
84
  <?php echo $this->getChildHtml('bottom'); ?>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Default_Iphone</name>
4
- <version>1.8.0.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a new iPhone optimized theme to the Magento default interface.</summary>
10
  <description>This is a new iPhone optimized theme to the Magento default interface.</description>
11
- <notes>1.8.0.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
- <date>2013-09-24</date>
14
- <time>09:09:42</time>
15
- <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="iphone"><dir name="etc"><file name="widget.xml" hash="5e9804936b7f3d2c35be89819141613b"/></dir><dir name="layout"><file name="bundle.xml" hash="4f719a4782b342967371c425b2909416"/><file name="catalogsearch.xml" hash="5b3a2c8ab0898fbf44668a7742fc651c"/><file name="catalog.xml" hash="7ec9a91bbef82ab41aacbe167317cee2"/><file name="checkout.xml" hash="39b2d28a9c161d9ce495d2b523a49e90"/><file name="cms.xml" hash="06f4b471cabda9aee96617423e2e56f0"/><file name="contacts.xml" hash="eef87967fb1ce52e786b8e4f71182e5a"/><file name="customer.xml" hash="1b72752bfe9fc160893f318a717c99d8"/><file name="newsletter.xml" hash="d5955480fe7af91e5e754e55de26fa0d"/><file name="page.xml" hash="f0e6fcc433a5b09447d4ac9a66c4fce2"/><file name="review.xml" hash="b1afa1804240afbb27620708b38983c7"/><file name="rss.xml" hash="49e4cfedc70aa8290377d110e1fb3836"/><dir name="sales"><file name="billing_agreement.xml" hash="b96413a2bc976638b7643611880b8f46"/><file name="recurring_profile.xml" hash="a85962828cfb6a8c4dbb49cec572b855"/></dir><file name="sales.xml" hash="a4c4ebc6f0664f71b57bb1eb20dfb92a"/><file name="sendfriend.xml" hash="0b1ba9791c3c8c2d3828012257563d1a"/><file name="tag.xml" hash="6aa377fe7600848ab5a5d80da074e780"/><file name="wishlist.xml" hash="22bf56fe97c67d578dbf66ac7d821e7c"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir><dir name="template"><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="view"><dir name="type"><file name="bundle.phtml" hash="16a55e883225335b32e0d66e9406c33d"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="items"><file name="renderer.phtml" hash="2214310ff8d56dd271647e2b45582306"/></dir></dir></dir></dir><dir name="catalog"><dir name="category"><file name="view.phtml" hash="c69e0e34a15ccc81af9e99f3dee6bff2"/></dir><dir name="layer"><file name="view.phtml" hash="24b2970d5b036a0f9bc2b52de839fc24"/></dir><dir name="navigation"><file name="top.phtml" hash="883dddaeff3b0f3da59eff55b1fc3610"/></dir><dir name="product"><file name="gallery.phtml" hash="00178b2e29940c03db25dad9cbd9eeb8"/><dir name="list"><file name="toolbar.phtml" hash="3b10871ce123a7544cc2f460aef582ca"/><file name="upsell.phtml" hash="5b583771f30077362353c03a4312a383"/></dir><file name="list.phtml" hash="43db27b580d51d1aa08a7cbdec6bd8cb"/><file name="price_msrp_noform.phtml" hash="359246779ba978683c2552e68ae3a7a4"/><file name="price_msrp.phtml" hash="359246779ba978683c2552e68ae3a7a4"/><file name="price.phtml" hash="4781d301417644230d4dd85adc332b0b"/><dir name="view"><file name="addto.phtml" hash="a0a9b34504ffba543f8afd931c099af1"/><file name="media.phtml" hash="dca2ce7975c5daccd8904ef957c9ac34"/><dir name="options"><file name="wrapper.phtml" hash="e2805a514fc89e90edaa60998c9d8487"/></dir></dir><file name="view.phtml" hash="3b7ebc6057051153a08a49279deb2932"/></dir></dir><dir name="catalogsearch"><file name="form.mini.phtml" hash="3ae1a79811f5e10e1c3755638a4c4552"/><file name="result.phtml" hash="dccf22a0bc6f552337b688ffd82a34b5"/></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="3a2e923e85bfb40d8bd8990371b72f23"/></dir></dir><file name="cart.phtml" hash="5f12567fdfea426bb1e433cf6b58b90c"/><dir name="onepage"><dir name="review"><file name="info.phtml" hash="580c367e2d27118bb51d44c63d1d4142"/><file name="item.phtml" hash="6dede454e37985cb09a2dfcb707e1984"/><file name="totals.phtml" hash="88b62146726d0f93f562cb13d6897896"/></dir></dir><file name="success.phtml" hash="3e003579d7c86c7300e512e454806665"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="7492476a56e4e7e859dfd2edaa78548d"/></dir><file name="navigation.phtml" hash="19c5ad971ab86fca97e847fa3049746b"/></dir><dir name="address"><file name="book.phtml" hash="d3bc0acd7c69a988724f76924f0ca1f0"/></dir><dir name="form"><file name="login.phtml" hash="df0cd1767ede66b97dc2c9f5fd0a30e8"/></dir></dir><dir name="downloadable"><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="ff8ece573b15198cf9e2c5ed12a2e1ef"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="dc8c9bad5bff70e5d2494c654e8d290e"/></dir></dir></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="955c17087caa6a8750bc2dcd055b17c4"/></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="ec7b687d2c88af85e0a9d0326c8ed351"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="7326d6a9331792535fa1371ac58c341b"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="a10483b8c6abd46062ab1dc5d232898e"/></dir></dir></dir></dir></dir><dir name="newsletter"><file name="subscribe.phtml" hash="75cd438683098bae9d5b44ed742a6853"/></dir><dir name="page"><file name="1column.phtml" hash="0d9882043c138a92b13212fecaed9646"/><dir name="html"><file name="footer.phtml" hash="efa6a8140d087969876829b1a273396c"/><file name="header.phtml" hash="2c22cad34be4340c4888fdf8fb272f74"/><file name="head.phtml" hash="63bc816671c377010405863f38400a10"/><file name="pager.phtml" hash="1f33c87fe9afc10120e8876c1523a173"/></dir><dir name="switch"><file name="languages.phtml" hash="7c94be13d18d219b571ccc8733c56236"/><file name="stores.phtml" hash="16e4e69253dff659062a0a22f9dc98ab"/></dir><dir name="template"><file name="links.phtml" hash="5943b192bd80605b2baa657c8f9a52e5"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="b09de6f2f11bc812066c9dd28b51edee"/></dir><file name="review.phtml" hash="5c0e7313ce981f445a8f2eff1cf9611f"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="83cd8d201df6b71b3d68e688e42de88c"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="db9c85d47643150fe67704a2bd40515a"/></dir></dir><file name="remember_me_tooltip.phtml" hash="609464263635f85fc3622cccc0b2e207"/></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="0b74b7e1deacc212bc16dcd6d2f3994d"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="39e2d91b24c4621559785f6ac3f5ff23"/></dir><file name="agreements.phtml" hash="2972d0e166669b262033787119be72c4"/></dir><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="b6a2b16fdbd92aab8cd3fc5f77c97c17"/></dir></dir><file name="items.phtml" hash="7b3add7dd54d88e6412ba551d3d601b1"/></dir><file name="history.phtml" hash="07e75aaec3f60434870b2829468df90a"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="726ac6709826278402835bd540c88b44"/></dir></dir><file name="items.phtml" hash="2d36c7a528568c3b68aa297d6175ecfe"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="6cb214bc5931b37eeb3b8eb8a2e76fff"/></dir></dir><file name="items.phtml" hash="a68b40b9aff33e65bcb8f50c71c1aedb"/><file name="recent.phtml" hash="c951c92e297df0805ba55354fef97e26"/><file name="totals.phtml" hash="15f9d5f97bf2ef72da746be836e48377"/></dir></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="popup.phtml" hash="47f18bb230d631b0e89b76d8c8285927"/></dir></dir><dir name="tag"><file name="list.phtml" hash="a6d1c1a896a5f04670c5db62dfb454a4"/></dir><dir name="tax"><dir name="order"><file name="tax.phtml" hash="0eb20201bca4eaed0d21b30e38908870"/></dir></dir><dir name="wishlist"><dir name="item"><dir name="column"><file name="cart.phtml" hash="de942f510e607c4ccc0b48a24ace97a0"/><file name="image.phtml" hash="9fa1072a69cbf9d5c51b22d4623e3f21"/><file name="info.phtml" hash="a7b407192cd512a162e5e5bb33480a4a"/></dir><dir name="configure"><file name="addto.phtml" hash="a9b4c1c93cd36247925e5c0312f1c570"/></dir><file name="list.phtml" hash="b9444e9cd5cce4b379441e2e0a45b15e"/></dir><file name="shared.phtml" hash="fc911fbdf5885f3a1dd2cda24cd99154"/><file name="view.phtml" hash="ac745c76a3509493a03cdc8ac1397845"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="iphone"><dir name="css"><file name="custom.css" hash="e63297e096604d6468c8e3cc5cfc1dcf"/><file name="iphone.css" hash="e74a9149412e42e32a2cdf408c4e8e83"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="arrow_left.png" hash="7081d0d3d7729c8df6aaffa67d55f41a"/><file name="arrow_left_retina.png" hash="2c0839350a1cece23755e5a0ed00ebf5"/><file name="arrow_right.png" hash="bec6839d4fbbfed074f8fa46da82583f"/><file name="arrow_right_retina.png" hash="372ce000e7b115d1bdace341d8e896f1"/><file name="bg_back_btn.png" hash="3a6212d4447198e7ca9cc9990255a919"/><file name="bg_back_btn_retina.png" hash="b6894134cd3d8860df912f8df0d5111f"/><file name="bg_checkbox.png" hash="64d515d23e7661a69ac58713d1c73f9c"/><file name="bg_checkout_step_passed.png" hash="b49944bf8104345375978a40c7a7c92d"/><file name="bg_divider_dark.png" hash="bdefe066741b9019e7f2f831d78326c2"/><file name="bg_divider_dark_retina.png" hash="b2cb3058c08726a83b1feb0c3d1170ed"/><file name="bg_divider.png" hash="ba2a43d9e360c99ce443d4bdf5b85ffd"/><file name="bg_divider_retina.png" hash="20c5b12f6477e1aea2c943fcc707daa0"/><file name="bg_gradient.png" hash="117891b39d6944afee56441d832695aa"/><file name="bg_gradient_retina.png" hash="d562372c4c0a82c3166aa6429e224134"/><file name="bg_shadow.png" hash="ff56f0eba3cbf7d453b98ec6f0dff762"/><file name="bg_shadow_retina.png" hash="f7fbd64eef2e917e2510c02701f3dcdd"/><file name="btn_edit.png" hash="b5db4c39106c54b8a398dd0cd7456ca6"/><file name="btn_edit_retina.png" hash="afb469a5300d50178f97827e6d81b3a6"/><file name="btn_remove.png" hash="85a455dbc19b798db021f49a233a0074"/><file name="btn_remove_retina.png" hash="3753999730503155256ee20cd75aeba1"/><dir name="custom"><file name="arrow.png" hash="86fe4be42cf815703b281f7cd60e3b47"/><file name="arrow_retina.png" hash="45fee5f79b118e9a48521419ac530ba7"/><file name="bg_header.png" hash="bdef8eb94b88c1131ba458b55965bbc6"/><file name="bg_header_retina.png" hash="fd4f83a9ce8e59b02a559da09b0bf574"/><file name="bg_logo.png" hash="baef4dfa239d520769dd2fd3eaa9171c"/><file name="bg_logo_retina.png" hash="fab8c423be5133e45e5fff72680396fc"/></dir><file name="i_cart.png" hash="df5a51680821193b78c1987ea32ce985"/><file name="i_cart_retina.png" hash="52108f042de6dcebcab30c0e6fb54096"/><file name="i_dropdown.png" hash="2417495ef0c87816f949c338fd0dfd79"/><file name="i_dropdown_retina.png" hash="5acb1effecb2fde5772adce02f110196"/><file name="i_menu.png" hash="f67f56724a8c2952929e0286ed414fe1"/><file name="i_menu_retina.png" hash="6f42380e1a22d054a16f89f16d8fe79b"/><file name="i_search.png" hash="32494d8a4c080d5c7a3f44457e9568d5"/><file name="i_search_retina.png" hash="c8865e46ca3851fc481ce24b63121849"/><file name="i_star_blank.png" hash="d430896eaf6f887e27270603f733411d"/><file name="i_star_blank_retina.png" hash="f97de532ec2b88cf0790b73e9e1910fe"/><file name="i_star.png" hash="f10afff0ab8fe39aa06e4b70b6117749"/><file name="i_star_retina.png" hash="40f3234c69c224de618b023d2a7a008c"/><file name="i_zoom.png" hash="8caede3901588dcdf9b88ed860141cbf"/><file name="i_zoom_retina.png" hash="24e0813f2a9b0dd8397697099a1a2b77"/><file name="loader.gif" hash="0402daa1f96d4f651346d98cde610fca"/><file name="logo.gif" hash="83ed0d84a9436a76fd9cc200e8fcab83"/><dir name="media"><file name="cell_phone_landing_banner1.jpg" hash="b25562360fc470f1091ca7ea014a3290"/></dir><file name="opc-ajax-loader.gif" hash="3eb92a9317c81f5a7d67e8534f1d6ff9"/></dir><dir name="js"><file name="dnd.js" hash="1db5896c1c0fe493a4f108ee247409d3"/><file name="iphone.js" hash="3c29c921aa240066c7a1c79cca17b054"/><file name="modernizr.js" hash="28014fb17bb46d3d454f542a04b244bb"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Interface_Frontend_Default_Iphone</name>
4
+ <version>1.8.1.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>This is a new iPhone optimized theme to the Magento default interface.</summary>
10
  <description>This is a new iPhone optimized theme to the Magento default interface.</description>
11
+ <notes>1.8.1.0</notes>
12
  <authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13
+ <date>2013-11-22</date>
14
+ <time>04:16:48</time>
15
+ <contents><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="iphone"><dir name="etc"><file name="widget.xml" hash="5e9804936b7f3d2c35be89819141613b"/></dir><dir name="layout"><file name="bundle.xml" hash="4f719a4782b342967371c425b2909416"/><file name="catalog.xml" hash="7ec9a91bbef82ab41aacbe167317cee2"/><file name="catalogsearch.xml" hash="5b3a2c8ab0898fbf44668a7742fc651c"/><file name="checkout.xml" hash="39b2d28a9c161d9ce495d2b523a49e90"/><file name="cms.xml" hash="06f4b471cabda9aee96617423e2e56f0"/><file name="contacts.xml" hash="eef87967fb1ce52e786b8e4f71182e5a"/><file name="customer.xml" hash="059864df3da31d8b9d1ae707c0e2f816"/><file name="newsletter.xml" hash="d5955480fe7af91e5e754e55de26fa0d"/><file name="page.xml" hash="f0e6fcc433a5b09447d4ac9a66c4fce2"/><file name="review.xml" hash="b1afa1804240afbb27620708b38983c7"/><file name="rss.xml" hash="49e4cfedc70aa8290377d110e1fb3836"/><dir name="sales"><file name="billing_agreement.xml" hash="b96413a2bc976638b7643611880b8f46"/><file name="recurring_profile.xml" hash="a85962828cfb6a8c4dbb49cec572b855"/></dir><file name="sales.xml" hash="722e35475d8f968d2e95edf7fc6fc8f1"/><file name="sendfriend.xml" hash="0b1ba9791c3c8c2d3828012257563d1a"/><file name="tag.xml" hash="6aa377fe7600848ab5a5d80da074e780"/><file name="wishlist.xml" hash="22bf56fe97c67d578dbf66ac7d821e7c"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir><dir name="template"><dir name="bundle"><dir name="catalog"><dir name="product"><dir name="view"><dir name="type"><file name="bundle.phtml" hash="16a55e883225335b32e0d66e9406c33d"/></dir></dir></dir></dir><dir name="sales"><dir name="order"><dir name="items"><file name="renderer.phtml" hash="854487241396cd4a2b8ca25574eebf22"/></dir></dir></dir></dir><dir name="catalog"><dir name="category"><file name="view.phtml" hash="c69e0e34a15ccc81af9e99f3dee6bff2"/></dir><dir name="layer"><file name="view.phtml" hash="24b2970d5b036a0f9bc2b52de839fc24"/></dir><dir name="navigation"><file name="top.phtml" hash="883dddaeff3b0f3da59eff55b1fc3610"/></dir><dir name="product"><file name="gallery.phtml" hash="955f3b7f51e07014853d275f7d34c45d"/><dir name="list"><file name="toolbar.phtml" hash="3b10871ce123a7544cc2f460aef582ca"/><file name="upsell.phtml" hash="5b583771f30077362353c03a4312a383"/></dir><file name="list.phtml" hash="43db27b580d51d1aa08a7cbdec6bd8cb"/><file name="price.phtml" hash="33e768b11d54af5c49260bfc93462172"/><file name="price_msrp.phtml" hash="359246779ba978683c2552e68ae3a7a4"/><file name="price_msrp_noform.phtml" hash="359246779ba978683c2552e68ae3a7a4"/><dir name="view"><file name="addto.phtml" hash="a0a9b34504ffba543f8afd931c099af1"/><file name="media.phtml" hash="dca2ce7975c5daccd8904ef957c9ac34"/><dir name="options"><file name="wrapper.phtml" hash="e2805a514fc89e90edaa60998c9d8487"/></dir></dir><file name="view.phtml" hash="3b7ebc6057051153a08a49279deb2932"/></dir></dir><dir name="catalogsearch"><file name="form.mini.phtml" hash="3ae1a79811f5e10e1c3755638a4c4552"/><file name="result.phtml" hash="dccf22a0bc6f552337b688ffd82a34b5"/></dir><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="22ca72257af7237e2e89e34071576f56"/></dir></dir><file name="cart.phtml" hash="359dacc11f3f9bfae8b6e58c70586cad"/><dir name="onepage"><dir name="review"><file name="info.phtml" hash="580c367e2d27118bb51d44c63d1d4142"/><file name="item.phtml" hash="a1b44c4b03e7599a36cb5fb6c1a33f77"/><file name="totals.phtml" hash="88b62146726d0f93f562cb13d6897896"/></dir></dir><file name="success.phtml" hash="3e003579d7c86c7300e512e454806665"/></dir><dir name="customer"><dir name="account"><dir name="dashboard"><file name="address.phtml" hash="7492476a56e4e7e859dfd2edaa78548d"/></dir><file name="navigation.phtml" hash="19c5ad971ab86fca97e847fa3049746b"/></dir><dir name="address"><file name="book.phtml" hash="d3bc0acd7c69a988724f76924f0ca1f0"/></dir><dir name="form"><file name="login.phtml" hash="cde1fc32d86ae04be63269d936283228"/></dir></dir><dir name="downloadable"><dir name="checkout"><dir name="cart"><dir name="item"><file name="default.phtml" hash="9eb9e6d6ac11aed0658514787c987a22"/></dir></dir><dir name="onepage"><dir name="review"><file name="item.phtml" hash="c08ad14d1aad1edc4b6d7d8db332345c"/></dir></dir></dir><dir name="customer"><dir name="products"><file name="list.phtml" hash="955c17087caa6a8750bc2dcd055b17c4"/></dir></dir><dir name="sales"><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="f2402b5b99f299e1c1db3a17c0a1d379"/></dir></dir></dir><dir name="invoice"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="d9a340cf9642f791b5cdc082aa59db27"/></dir></dir></dir><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="f191cb5c03246ab7d991099eaeabb5c3"/></dir></dir></dir></dir></dir><dir name="newsletter"><file name="subscribe.phtml" hash="75cd438683098bae9d5b44ed742a6853"/></dir><dir name="page"><file name="1column.phtml" hash="0d9882043c138a92b13212fecaed9646"/><dir name="html"><file name="footer.phtml" hash="efa6a8140d087969876829b1a273396c"/><file name="head.phtml" hash="63bc816671c377010405863f38400a10"/><file name="header.phtml" hash="2c22cad34be4340c4888fdf8fb272f74"/><file name="pager.phtml" hash="1f33c87fe9afc10120e8876c1523a173"/></dir><dir name="switch"><file name="languages.phtml" hash="7c94be13d18d219b571ccc8733c56236"/><file name="stores.phtml" hash="16e4e69253dff659062a0a22f9dc98ab"/></dir><dir name="template"><file name="links.phtml" hash="5943b192bd80605b2baa657c8f9a52e5"/></dir></dir><dir name="paypal"><dir name="express"><dir name="review"><file name="details.phtml" hash="b09de6f2f11bc812066c9dd28b51edee"/></dir><file name="review.phtml" hash="5c0e7313ce981f445a8f2eff1cf9611f"/></dir></dir><dir name="persistent"><dir name="checkout"><dir name="onepage"><file name="login.phtml" hash="44bc7025efa62e09718828df0ef11370"/></dir></dir><dir name="customer"><dir name="form"><file name="login.phtml" hash="5e7f9353e2d181b19ec2d25b282319ad"/></dir></dir><file name="remember_me_tooltip.phtml" hash="609464263635f85fc3622cccc0b2e207"/></dir><dir name="review"><dir name="customer"><file name="list.phtml" hash="0b74b7e1deacc212bc16dcd6d2f3994d"/></dir></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="view.phtml" hash="39e2d91b24c4621559785f6ac3f5ff23"/></dir><file name="agreements.phtml" hash="2972d0e166669b262033787119be72c4"/></dir><dir name="order"><dir name="creditmemo"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="e93ed55b5e219c313aca1d3b0a8f8c8c"/></dir></dir><file name="items.phtml" hash="7b3add7dd54d88e6412ba551d3d601b1"/></dir><file name="history.phtml" hash="07e75aaec3f60434870b2829468df90a"/><dir name="invoice"><dir name="items"><dir name="renderer"><file name="default.phtml" hash="cf496bd04a6cee02902a93ee0fcaf41a"/></dir></dir><file name="items.phtml" hash="2d36c7a528568c3b68aa297d6175ecfe"/></dir><dir name="items"><dir name="renderer"><file name="default.phtml" hash="ae53bdaf6e55a4359197cd4eade75f16"/></dir></dir><file name="items.phtml" hash="a68b40b9aff33e65bcb8f50c71c1aedb"/><file name="recent.phtml" hash="c951c92e297df0805ba55354fef97e26"/><file name="totals.phtml" hash="15f9d5f97bf2ef72da746be836e48377"/></dir></dir><dir name="shipping"><dir name="tracking"><file name="ajax.phtml" hash="68b329da9893e34099c7d8ad5cb9c940"/><file name="popup.phtml" hash="47f18bb230d631b0e89b76d8c8285927"/></dir></dir><dir name="tag"><file name="list.phtml" hash="a6d1c1a896a5f04670c5db62dfb454a4"/></dir><dir name="tax"><dir name="order"><file name="tax.phtml" hash="0eb20201bca4eaed0d21b30e38908870"/></dir></dir><dir name="wishlist"><dir name="item"><dir name="column"><file name="cart.phtml" hash="de942f510e607c4ccc0b48a24ace97a0"/><file name="image.phtml" hash="9fa1072a69cbf9d5c51b22d4623e3f21"/><file name="info.phtml" hash="a7b407192cd512a162e5e5bb33480a4a"/></dir><dir name="configure"><file name="addto.phtml" hash="a9b4c1c93cd36247925e5c0312f1c570"/></dir><file name="list.phtml" hash="b9444e9cd5cce4b379441e2e0a45b15e"/></dir><file name="shared.phtml" hash="fc911fbdf5885f3a1dd2cda24cd99154"/><file name="view.phtml" hash="89616d569d06e88eb8311f079fce9d89"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="iphone"><dir name="css"><file name="custom.css" hash="e63297e096604d6468c8e3cc5cfc1dcf"/><file name="iphone.css" hash="a35de1b85e5312aa430e9acdf2d6804d"/></dir><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><dir name="images"><file name="arrow_left.png" hash="7081d0d3d7729c8df6aaffa67d55f41a"/><file name="arrow_left_retina.png" hash="2c0839350a1cece23755e5a0ed00ebf5"/><file name="arrow_right.png" hash="bec6839d4fbbfed074f8fa46da82583f"/><file name="arrow_right_retina.png" hash="372ce000e7b115d1bdace341d8e896f1"/><file name="bg_back_btn.png" hash="3a6212d4447198e7ca9cc9990255a919"/><file name="bg_back_btn_retina.png" hash="b6894134cd3d8860df912f8df0d5111f"/><file name="bg_checkbox.png" hash="64d515d23e7661a69ac58713d1c73f9c"/><file name="bg_checkout_step_passed.png" hash="b49944bf8104345375978a40c7a7c92d"/><file name="bg_divider.png" hash="ba2a43d9e360c99ce443d4bdf5b85ffd"/><file name="bg_divider_dark.png" hash="bdefe066741b9019e7f2f831d78326c2"/><file name="bg_divider_dark_retina.png" hash="b2cb3058c08726a83b1feb0c3d1170ed"/><file name="bg_divider_retina.png" hash="20c5b12f6477e1aea2c943fcc707daa0"/><file name="bg_gradient.png" hash="117891b39d6944afee56441d832695aa"/><file name="bg_gradient_retina.png" hash="d562372c4c0a82c3166aa6429e224134"/><file name="bg_shadow.png" hash="ff56f0eba3cbf7d453b98ec6f0dff762"/><file name="bg_shadow_retina.png" hash="f7fbd64eef2e917e2510c02701f3dcdd"/><file name="btn_edit.png" hash="b5db4c39106c54b8a398dd0cd7456ca6"/><file name="btn_edit_retina.png" hash="afb469a5300d50178f97827e6d81b3a6"/><file name="btn_remove.png" hash="85a455dbc19b798db021f49a233a0074"/><file name="btn_remove_retina.png" hash="3753999730503155256ee20cd75aeba1"/><dir name="custom"><file name="arrow.png" hash="86fe4be42cf815703b281f7cd60e3b47"/><file name="arrow_retina.png" hash="45fee5f79b118e9a48521419ac530ba7"/><file name="bg_header.png" hash="bdef8eb94b88c1131ba458b55965bbc6"/><file name="bg_header_retina.png" hash="fd4f83a9ce8e59b02a559da09b0bf574"/><file name="bg_logo.png" hash="baef4dfa239d520769dd2fd3eaa9171c"/><file name="bg_logo_retina.png" hash="fab8c423be5133e45e5fff72680396fc"/></dir><file name="i_cart.png" hash="df5a51680821193b78c1987ea32ce985"/><file name="i_cart_retina.png" hash="52108f042de6dcebcab30c0e6fb54096"/><file name="i_dropdown.png" hash="2417495ef0c87816f949c338fd0dfd79"/><file name="i_dropdown_retina.png" hash="5acb1effecb2fde5772adce02f110196"/><file name="i_menu.png" hash="f67f56724a8c2952929e0286ed414fe1"/><file name="i_menu_retina.png" hash="6f42380e1a22d054a16f89f16d8fe79b"/><file name="i_search.png" hash="32494d8a4c080d5c7a3f44457e9568d5"/><file name="i_search_retina.png" hash="c8865e46ca3851fc481ce24b63121849"/><file name="i_star.png" hash="f10afff0ab8fe39aa06e4b70b6117749"/><file name="i_star_blank.png" hash="d430896eaf6f887e27270603f733411d"/><file name="i_star_blank_retina.png" hash="f97de532ec2b88cf0790b73e9e1910fe"/><file name="i_star_retina.png" hash="40f3234c69c224de618b023d2a7a008c"/><file name="i_zoom.png" hash="8caede3901588dcdf9b88ed860141cbf"/><file name="i_zoom_retina.png" hash="24e0813f2a9b0dd8397697099a1a2b77"/><file name="loader.gif" hash="0402daa1f96d4f651346d98cde610fca"/><file name="logo.gif" hash="83ed0d84a9436a76fd9cc200e8fcab83"/><dir name="media"><file name="cell_phone_landing_banner1.jpg" hash="b25562360fc470f1091ca7ea014a3290"/></dir><file name="opc-ajax-loader.gif" hash="3eb92a9317c81f5a7d67e8534f1d6ff9"/></dir><dir name="js"><file name="dnd.js" hash="1db5896c1c0fe493a4f108ee247409d3"/><file name="iphone.js" hash="e28903a43f88fb0a13bf3d6e265ca0fc"/><file name="modernizr.js" hash="28014fb17bb46d3d454f542a04b244bb"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.8.1.0</min><max>1.9.0.0</max></package></required></dependencies>
18
  </package>
skin/frontend/default/iphone/css/iphone.css CHANGED
@@ -342,6 +342,7 @@ body > header dd {
342
 
343
  body > header .search {
344
  display:table-cell;
 
345
  padding:5px 15px;
346
  vertical-align:middle;
347
  }
@@ -457,7 +458,6 @@ body > header dd.menu-box .badge {
457
  }
458
 
459
  body > header dd.menu-box .welcome-msg {
460
- background:url(../images/bg_drop.jpg) repeat-x 0 0;
461
  border-bottom:2px solid #585858;
462
  font-weight:bold;
463
  padding:10px;
@@ -502,69 +502,6 @@ body > header dd.menu-box ol li.selected {
502
  body > header dd.menu-box ol li.selected a {
503
  background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAKCAYAAABv7tTEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RjdEODVBMkI5Mzc4MTFFMEE2MDE5MzgwM0I5RkE1QjIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RjdEODVBMkM5Mzc4MTFFMEE2MDE5MzgwM0I5RkE1QjIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGN0Q4NUEyOTkzNzgxMUUwQTYwMTkzODAzQjlGQTVCMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGN0Q4NUEyQTkzNzgxMUUwQTYwMTkzODAzQjlGQTVCMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnMJ/AIAAABLSURBVHjaYmAgHgQAsQAJ6hkSgPg/EJ8nViNMAwwHwCQUiNSQgC6RQKwGEHiPRQKvBhAwQNM4n5AGXBoJasClMYHY+IBpxKsBIMAAi14oP6lEWTAAAAAASUVORK5CYII=) no-repeat left;
504
  }
505
-
506
- /* Navigation
507
- -----------------------------*/
508
- body > nav {
509
- background:-webkit-gradient(linear, 0 0, 0 100%, from(#1a1a1a), to(#000));
510
- background:-o-linear-gradient(top, #1a1a1a 0%, #000 100%);
511
- border-bottom:5px solid #3a3a3a;
512
- padding:10px 5px 0;
513
- }
514
- body > nav a { color:#fff; display:block; padding:9px 2px 7px; position:relative; font-size:16px; }
515
-
516
- body > nav ul {
517
- display:table;
518
- width:100%;
519
- }
520
-
521
- body > nav li {
522
- border-width:0 7px 0 7px;
523
- -webkit-border-image:url(../images/bg_nav_brd_inactive.png) 0 7 0 repeat stretch;
524
- display:table-cell;
525
- text-align:center;
526
- text-shadow:0 1px 1px rgba(0, 0, 0, 0.8);
527
- vertical-align:top;
528
- width:25%;
529
- -webkit-box-sizing:border-box;
530
- }
531
-
532
- body > nav span {
533
- background:-webkit-gradient(
534
- linear,
535
- 0 0,
536
- 0 100%,
537
- color-stop(1, #af0002),
538
- color-stop(0.62, #e1262f),
539
- color-stop(0.6, #e75159),
540
- color-stop(0, #f6bec1)
541
- );
542
- border:2px solid #fff;
543
- border-radius:15px;
544
- display:inline-block;
545
- color:#fff;
546
- font-size:14px;
547
- font-weight:bold;
548
- line-height:16px;
549
- padding:0 5px;
550
- position:absolute;
551
- right:-5px;
552
- top:-5px;
553
- -webkit-box-shadow:0 3px 3px #000;
554
- box-shadow:0 3px 3px #000;
555
- }
556
-
557
- body > nav .active {
558
- border-width:0 12px 0 12px;
559
- -webkit-border-image:url(../images/bg_nav_brd.png) 0 13 0 13 stretch stretch;
560
- font-weight:bold;
561
- }
562
-
563
- body > nav .active a {
564
- color:#000;
565
- font-weight:normal;
566
- text-shadow:0 1px 1px #ccc;
567
- }
568
 
569
  /* Footer
570
  -----------------------------*/
@@ -1185,7 +1122,7 @@ input[type="checkbox"]:checked {
1185
  .catalog-product-gallery .product-gallery .next { left:80%; }
1186
  .catalog-product-gallery .product-gallery ul { display:table; width:200%; }
1187
  .catalog-product-gallery .product-gallery li { display:table-cell; padding:0; text-align:center; overflow:hidden; max-width:100%; }
1188
- .catalog-product-gallery .product-gallery li img { vertical-align:bottom; }
1189
 
1190
  .catalog-product-gallery .add-to-cart {}
1191
 
342
 
343
  body > header .search {
344
  display:table-cell;
345
+ overflow: hidden;
346
  padding:5px 15px;
347
  vertical-align:middle;
348
  }
458
  }
459
 
460
  body > header dd.menu-box .welcome-msg {
 
461
  border-bottom:2px solid #585858;
462
  font-weight:bold;
463
  padding:10px;
502
  body > header dd.menu-box ol li.selected a {
503
  background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAKCAYAAABv7tTEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RjdEODVBMkI5Mzc4MTFFMEE2MDE5MzgwM0I5RkE1QjIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RjdEODVBMkM5Mzc4MTFFMEE2MDE5MzgwM0I5RkE1QjIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGN0Q4NUEyOTkzNzgxMUUwQTYwMTkzODAzQjlGQTVCMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGN0Q4NUEyQTkzNzgxMUUwQTYwMTkzODAzQjlGQTVCMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnMJ/AIAAABLSURBVHjaYmAgHgQAsQAJ6hkSgPg/EJ8nViNMAwwHwCQUiNSQgC6RQKwGEHiPRQKvBhAwQNM4n5AGXBoJasClMYHY+IBpxKsBIMAAi14oP6lEWTAAAAAASUVORK5CYII=) no-repeat left;
504
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
505
 
506
  /* Footer
507
  -----------------------------*/
1122
  .catalog-product-gallery .product-gallery .next { left:80%; }
1123
  .catalog-product-gallery .product-gallery ul { display:table; width:200%; }
1124
  .catalog-product-gallery .product-gallery li { display:table-cell; padding:0; text-align:center; overflow:hidden; max-width:100%; }
1125
+ .catalog-product-gallery .product-gallery li img { max-width:100%; height:auto; vertical-align:bottom; }
1126
 
1127
  .catalog-product-gallery .add-to-cart {}
1128
 
skin/frontend/default/iphone/js/iphone.js CHANGED
@@ -63,13 +63,13 @@ document.observe("dom:loaded", function() {
63
  var loadMore = Class.create({
64
  initialize: function (list, href, pattern) {
65
  var that = this;
66
-
67
  this.list = list;
68
  this.list.insert({ after : '<div class="more"><span id="more_button" class="more-button">More</span></div>'});
69
  this.href = href.readAttribute('href');
70
  this.button = $('more_button');
71
  this.holder = new Element('div', { 'class': 'response-holder' });
72
-
73
  this.button.observe('click', function () {
74
  if ( !that.button.hasClassName('loading') ) {
75
  new Ajax.Request(that.href, {
@@ -78,7 +78,8 @@ document.observe("dom:loaded", function() {
78
  },
79
  onComplete: function(response) {
80
  if (200 == response.status) {
81
- that.holder.update(response.responseText).select(pattern).each(function(elem) {
 
82
  that.list.insert({ bottom : elem });
83
  });
84
  that.href = that.holder.select('.next-page')[0].readAttribute('href');
@@ -102,7 +103,7 @@ document.observe("dom:loaded", function() {
102
  '.c-list > li'
103
  )
104
  }
105
-
106
  if ( $$('.downloadable-products-history .list')[0] && $$('.next-page')[0] ) {
107
  var loadMoreCategory = new loadMore(
108
  $$('.downloadable-products-history .list')[0],
@@ -110,7 +111,7 @@ document.observe("dom:loaded", function() {
110
  '.downloadable-products-history .list > li'
111
  )
112
  }
113
-
114
  if ( $$('.review-history .list')[0] && $$('.next-page')[0] ) {
115
  var loadMoreCategory = new loadMore(
116
  $$('.review-history .list')[0],
@@ -118,7 +119,7 @@ document.observe("dom:loaded", function() {
118
  '.review-history .list > li'
119
  )
120
  }
121
-
122
  if ( $$('.recent-orders .data-table')[0] && $$('.next-page')[0] ) {
123
  var loadMoreCategory = new loadMore(
124
  $$('.recent-orders .data-table')[0],
@@ -126,17 +127,17 @@ document.observe("dom:loaded", function() {
126
  '.recent-orders .data-table tbody > tr'
127
  )
128
  }
129
-
130
  //-----------------------------//
131
 
132
  $$('label[for]').each(function(label) {
133
  label.observe('click', function() {});
134
  });
135
-
136
  $$('input.validate-email').each(function (input) {
137
  input.writeAttribute('type', 'email');
138
  });
139
-
140
  $$('.form-list img[src*="calendar.gif"]').each(function (img) {
141
  img.up().insert({ 'top' : img });
142
  });
@@ -148,7 +149,7 @@ document.observe("dom:loaded", function() {
148
  if ( $('my-reviews-table') ) {
149
  $('my-reviews-table').wrap('div', { 'class' : 'my-reviews-table-wrap' });
150
  }
151
-
152
  $$('.my-account .dashboard .box-title').each(function (elem) {
153
  elem.observe('click', function (e) {
154
  if ( e.target.hasClassName('box-title') ) {
@@ -179,15 +180,14 @@ document.observe("dom:loaded", function() {
179
  if ( $('product-review-table') ) {
180
  $('product-review-table').wrap('div', {'class' : 'review-table-wrap'}).on('click', 'input[type="radio"]', function (e) {
181
 
182
- $this = e.target;
183
 
184
  $this.up('tr').select('td').invoke('removeClassName', 'checked');
185
-
186
- $this.up().previousSiblings().each(function (td) {
187
- if ( td.hasClassName('value') ) {
188
- td.addClassName('checked');
189
- }
190
- });
191
 
192
  });
193
  }
@@ -537,140 +537,186 @@ document.observe("dom:loaded", function() {
537
  //Slider
538
 
539
  var Carousel = Class.create({
540
- initialize: function (carousel, itemsContainer, options) {
541
- this.options = Object.extend({
542
- visibleElements: 3,
543
- threshold: {
544
- x: 30,
545
- y: 40
546
- },
547
- preventDefaultEvents: false
548
- }, options || {});
549
-
550
- this.carousel = carousel;
551
- this.items = itemsContainer.addClassName('carousel-items');
552
- this.itemsWrap = this.items.wrap('div', {'class' : 'carousel-items-wrap'});
553
- this.itemsLength = this.items.childElements().size();
554
- this.counter = this.carousel.insert(new Element('div', {'class' : 'counter'})).select('.counter')[0];
555
- this.controls = carousel.select('.controls')[0] || this.carousel.insert({ top: new Element('div', { 'class' : 'controls'}) }).select('.controls')[0];
556
- this.prevButton = carousel.select('.prev')[0] || this.controls.insert({ top: new Element('span', { 'class' : 'prev'}) }).select('.prev')[0].addClassName('disabled');
557
- this.nextButton = carousel.select('.next')[0] || this.controls.insert({ top: new Element('span', { 'class' : 'next'}) }).select('.next')[0];
558
- this.originalCoord = { x: 0, y: 0 };
559
- this.finalCoord = { x: 0, y: 0 };
560
-
561
- this.carousel.wrap('div', { 'class' : 'carousel-wrap' });
562
-
563
- this.nextButton.observe('click', this.moveRight.bind(this));
564
- this.prevButton.observe('click', this.moveLeft.bind(this));
565
- this.itemsWrap.observe('touchstart', this.touchStart.bind(this));
566
- this.itemsWrap.observe('touchmove', this.touchMove.bind(this));
567
- this.itemsWrap.observe('touchend', this.touchEnd.bind(this));
568
- },
569
- init: function () {
 
 
 
 
 
 
 
 
570
  this.itemPos = 0;
571
- this.lastItemPos = (this.itemsLength-this.options.visibleElements) * 100/this.options.visibleElements;
572
- this.itemWidth = 100/this.options.visibleElements + '%';
573
  this.screens = Math.ceil(this.itemsLength/this.options.visibleElements);
574
 
575
- this.resizeChilds();
576
- this.drawCounter();
 
 
577
 
578
  return this;
579
  },
 
580
  resize: function(visibleElements) {
581
  var transformValue = {};
582
  this.options.visibleElements = visibleElements;
583
- this.counter.childElements().invoke('remove');
 
 
584
  if ( Modernizr.csstransforms3d ) {
585
- transformValue[transformPref] = 'translateX(' + 0 + '%)';
586
  } else if ( Modernizr.csstransforms ) {
587
- transformValue[transformPref] = 'translate(' + 0 + '%, 0)';
588
  }
589
  this.items.setStyle(transformValue);
590
  this.prevButton.addClassName('disabled');
591
  this.nextButton.removeClassName('disabled');
592
  this.init();
593
  },
594
- resizeChilds: function () {
595
- this.items.childElements().each( function(n) {
596
- n.setStyle({
597
- 'width': this.itemWidth
598
- });
599
- }, this);
 
600
  },
 
 
 
 
 
 
 
601
  drawCounter: function () {
602
  if (this.screens > 1) {
603
  if (this.controls)
604
- this.controls.show()
605
  for (var i = 0; i < this.screens; i++) {
606
  if (i === 0) {
607
  this.counter.insert(new Element('span', {'class': 'active'}));
608
  } else {
609
  this.counter.insert(new Element('span'));
610
  }
611
- };
612
  } else {
613
  if (this.controls)
614
  this.controls.hide();
615
  }
616
  },
617
- moveRight: function (e) {
618
- if(Math.abs(this.itemPos) < this.lastItemPos) {
619
- var transformValue = {};
620
- this.itemPos -= 100/this.options.visibleElements * this.options.visibleElements;
621
- if ( Modernizr.csstransforms3d ) {
622
- transformValue[transformPref] = 'translateX(' + this.itemPos + '%)';
623
- transformValue['position'] = 'relative';
624
- } else if ( Modernizr.csstransforms ) {
625
- transformValue[transformPref] = 'translate(' + this.itemPos + '%, 0)';
626
- transformValue['position'] = 'relative';
627
- }
628
- this.items.setStyle(transformValue);
629
- if (Math.abs(this.itemPos) >= this.lastItemPos) {
630
- this.nextButton.addClassName('disabled');
631
- }
632
 
633
- if (this.prevButton.hasClassName('disabled')) {
634
- this.prevButton.removeClassName('disabled');
635
- };
636
- this.counter.select('.active')[0].removeClassName('active').next().addClassName('active');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
637
  }
638
  },
639
- moveLeft: function (e) {
640
- if (this.itemPos !== 0) {
641
- var transformValue = {};
642
- this.itemPos += 100/this.options.visibleElements * this.options.visibleElements;
643
- if ( Modernizr.csstransforms3d ) {
644
- transformValue[transformPref] = 'translateX(' + this.itemPos + '%)';
645
- transformValue['position'] = 'relative';
646
- } else if ( Modernizr.csstransforms ) {
647
- transformValue[transformPref] = 'translate(' + this.itemPos + '%, 0)';
648
- transformValue['position'] = 'relative';
649
- }
650
  this.items.setStyle(transformValue);
 
651
 
652
- if(this.itemPos === 0) {
653
- this.prevButton.addClassName('disabled');
654
- };
655
 
656
- if (this.nextButton.hasClassName('disabled')) {
657
- this.nextButton.removeClassName('disabled');
658
- };
659
- this.counter.select('.active')[0].removeClassName('active').previous().addClassName('active');
 
 
 
 
 
 
 
 
 
 
 
 
 
 
660
  }
661
  },
662
  touchStart: function (e) {
663
- this.originalCoord.x = event.targetTouches[0].pageX;
664
- this.originalCoord.y = event.targetTouches[0].pageY;
 
 
 
 
665
  },
666
  touchMove: function (e) {
667
  this.finalCoord.x = e.targetTouches[0].pageX;
668
  this.finalCoord.y = e.targetTouches[0].pageY;
669
 
670
- var changeX = 0;
671
  changeX = this.originalCoord.x - this.finalCoord.x;
 
672
 
673
- if(Math.abs(changeX) > this.options.threshold.x) {
 
 
 
 
674
  e.preventDefault();
675
  }
676
  },
@@ -678,13 +724,17 @@ document.observe("dom:loaded", function() {
678
  if ( e.preventSwipe ) {
679
  return
680
  }
681
- var changeX;
682
- changeX = this.originalCoord.x - this.finalCoord.x;
683
- if(changeX > this.options.threshold.x) {
684
- this.moveRight(e);
685
- }
686
- if(changeX < this.options.threshold.x * -1) {
687
- this.moveLeft(e);
 
 
 
 
688
  }
689
  }
690
  });
@@ -712,6 +762,13 @@ document.observe("dom:loaded", function() {
712
  }).init();
713
  }
714
 
 
 
 
 
 
 
 
715
  // Swipe Functionality
716
 
717
  var Swipe = Class.create( Carousel, {
@@ -816,10 +873,11 @@ document.observe("dom:loaded", function() {
816
  this.finalCoord = { x: 0, y: 0 };
817
  this.offset = { x: 0, y: 0 };
818
  this.ret = { x: 0, y: 0 };
819
-
 
820
  this.nextButton.observe('click', this.moveRight.bind(this));
821
  this.prevButton.observe('click', this.moveLeft.bind(this));
822
-
823
  if (this.itemsLength < 2) {
824
  this.controls.hide();
825
  }
@@ -838,6 +896,30 @@ document.observe("dom:loaded", function() {
838
  });
839
 
840
  this.drawCounter();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
841
  },
842
  drawCounter: function () {
843
  if (this.itemsLength > 1) {
@@ -851,9 +933,8 @@ document.observe("dom:loaded", function() {
851
  }
852
  },
853
  moveRight: function (elem) {
 
854
 
855
- if (this.pos !== this.lastPos - this.step) {
856
-
857
  if(elem == event) {
858
  this.items.each(function (elm) {
859
  elm.setStyle({
@@ -861,7 +942,7 @@ document.observe("dom:loaded", function() {
861
  'webkitTransform' : 'scale3d(1, 1, 1)'
862
  });
863
  });
864
- } else {
865
  elem.setStyle({
866
  'webkitTransition' : '300ms linear',
867
  'webkitTransform' : 'scale3d(1, 1, 1)'
@@ -882,8 +963,8 @@ document.observe("dom:loaded", function() {
882
  transformValue[transformPref] = 'translate(' + this.pos*-1 + '%, 0)';
883
  this.wrap.setStyle(transformValue);
884
  }
885
-
886
- if (this.pos == this.lastPos - this.step) {
887
  this.nextButton.addClassName('disabled');
888
  }
889
 
@@ -897,7 +978,7 @@ document.observe("dom:loaded", function() {
897
  },
898
  moveLeft: function (elem) {
899
 
900
- if (this.pos !== 0) {
901
 
902
  if(elem == event) {
903
  this.items.each(function (elm) {
@@ -927,8 +1008,8 @@ document.observe("dom:loaded", function() {
927
  transformValue[transformPref] = 'translate(' + this.pos*-1 + '%, 0)';
928
  this.wrap.setStyle(transformValue);
929
  }
930
-
931
- if (this.pos == 0) {
932
  this.prevButton.addClassName('disabled');
933
  }
934
 
@@ -939,7 +1020,6 @@ document.observe("dom:loaded", function() {
939
 
940
  this.counter.select('.active')[0].removeClassName('active').previous().addClassName('active');
941
  }
942
- //console.log('moveLeft()');
943
  },
944
  gestureStart : function (e) {
945
  var $this = e.target;
@@ -985,6 +1065,8 @@ document.observe("dom:loaded", function() {
985
  touchStart: function (e) {
986
  var $this = e.target;
987
 
 
 
988
  if (e.targetTouches.length != 1) {
989
  return false
990
  }
@@ -998,16 +1080,25 @@ document.observe("dom:loaded", function() {
998
  },
999
  touchMove: function (e) {
1000
 
 
 
1001
  this.finalCoord.x = e.targetTouches[0].clientX;
1002
  this.finalCoord.y = e.targetTouches[0].clientY;
1003
 
1004
- if (e.targetTouches.length != 1 || this.scale === 1.0 || this.gestureStart)
 
 
 
 
 
 
 
 
1005
  return false
 
1006
 
1007
  e.preventDefault();
1008
 
1009
- var $this = e.target;
1010
-
1011
  var changeX = this.offset.x + this.finalCoord.x - this.originalCoord.x,
1012
  changeY = this.offset.y + this.finalCoord.y - this.originalCoord.y,
1013
  topX = (this.dimensions.width * (this.scale - 1))/2,
@@ -1037,63 +1128,67 @@ document.observe("dom:loaded", function() {
1037
  },
1038
  touchEnd: function (e) {
1039
 
1040
- this.t2 = Date.now();
1041
 
1042
- var $this = e.target,
1043
- timeDelta = this.t2 - this.t1,
1044
- changeX = this.originalCoord.x - this.finalCoord.x,
1045
- changeY = this.originalCoord.y - this.finalCoord.y;
1046
 
1047
- if(changeX > this.options.threshold.x && Math.abs(changeY) < 40 && timeDelta < 300) {
1048
- this.moveRight($this);
1049
- }
1050
- if(changeX < this.options.threshold.x * -1 && Math.abs(changeY) < 40 && timeDelta < 300) {
1051
 
1052
- this.moveLeft($this);
1053
- }
 
 
1054
 
1055
- if (e.targetTouches.length > 0 || this.gestureStart || timeDelta < 100)
1056
- return false;
1057
 
1058
- this.offset.x += this.finalCoord.x - this.originalCoord.x;
1059
- this.offset.y += this.finalCoord.y - this.originalCoord.y;
1060
 
1061
- var topX = (this.dimensions.width * (this.scale - 1))/2,
1062
- topY = (this.dimensions.height * (this.scale - 1))/2,
1063
- moved = false;
1064
 
1065
- if ( Math.abs(this.offset.x) > topX ) {
 
 
1066
 
1067
- moved = true;
1068
- $this.setStyle({
1069
- 'webkitTransition' : '-webkit-transform 100ms ease-out',
1070
- 'webkitTransform' : 'translate3d(' + (this.offset.x < 0 ? topX*-1 : topX) + 'px,' + this.offset.y + 'px, 0) scale3d(' + this.scale + ',' + this.scale + ',1)'
1071
- });
 
 
1072
 
1073
- this.offset.x = this.offset.x < 0 ? topX*-1 : topX;
1074
 
1075
- }
1076
 
1077
- if ( Math.abs(this.offset.y) > topY ) {
1078
- moved = true;
1079
- $this.setStyle({
1080
- 'webkitTransition' : '-webkit-transform 100ms ease-out',
1081
- 'webkitTransform' : 'translate3d(' + this.offset.x + 'px,' + (this.offset.y < 0 ? topY*-1 : topY) + 'px, 0) scale3d(' + this.scale + ',' + this.scale + ',1)'
1082
- });
1083
 
1084
- this.offset.y = this.offset.y < 0 ? topY*-1 : topY;
1085
 
1086
- }
1087
 
1088
- if ( Math.abs(this.offset.x) > topX && Math.abs(this.offset.y) > topY && !moved ) {
1089
 
1090
- $this.setStyle({
1091
- 'webkitTransition' : '-webkit-transform 100ms ease-out',
1092
- 'webkitTransform' : 'translate3d(' + (this.offset.x < 0 ? topX*-1 : topX) + 'px,' + (this.offset.y < 0 ? topY*-1 : topY) + 'px, 0) scale3d(' + this.scale + ',' + this.scale + ',1)'
1093
- });
 
 
 
1094
 
1095
- this.offset.x = this.offset.x < 0 ? topX*-1 : topX;
1096
- this.offset.y = this.offset.y < 0 ? topY*-1 : topY;
1097
 
1098
  }
1099
 
@@ -1130,4 +1225,9 @@ document.observe("dom:loaded", function() {
1130
  });
1131
  }
1132
 
 
 
 
 
 
1133
  });
63
  var loadMore = Class.create({
64
  initialize: function (list, href, pattern) {
65
  var that = this;
66
+
67
  this.list = list;
68
  this.list.insert({ after : '<div class="more"><span id="more_button" class="more-button">More</span></div>'});
69
  this.href = href.readAttribute('href');
70
  this.button = $('more_button');
71
  this.holder = new Element('div', { 'class': 'response-holder' });
72
+
73
  this.button.observe('click', function () {
74
  if ( !that.button.hasClassName('loading') ) {
75
  new Ajax.Request(that.href, {
78
  },
79
  onComplete: function(response) {
80
  if (200 == response.status) {
81
+ that.holder.innerHTML = response.responseText;
82
+ that.holder.select(pattern).each(function(elem) {
83
  that.list.insert({ bottom : elem });
84
  });
85
  that.href = that.holder.select('.next-page')[0].readAttribute('href');
103
  '.c-list > li'
104
  )
105
  }
106
+
107
  if ( $$('.downloadable-products-history .list')[0] && $$('.next-page')[0] ) {
108
  var loadMoreCategory = new loadMore(
109
  $$('.downloadable-products-history .list')[0],
111
  '.downloadable-products-history .list > li'
112
  )
113
  }
114
+
115
  if ( $$('.review-history .list')[0] && $$('.next-page')[0] ) {
116
  var loadMoreCategory = new loadMore(
117
  $$('.review-history .list')[0],
119
  '.review-history .list > li'
120
  )
121
  }
122
+
123
  if ( $$('.recent-orders .data-table')[0] && $$('.next-page')[0] ) {
124
  var loadMoreCategory = new loadMore(
125
  $$('.recent-orders .data-table')[0],
127
  '.recent-orders .data-table tbody > tr'
128
  )
129
  }
130
+
131
  //-----------------------------//
132
 
133
  $$('label[for]').each(function(label) {
134
  label.observe('click', function() {});
135
  });
136
+
137
  $$('input.validate-email').each(function (input) {
138
  input.writeAttribute('type', 'email');
139
  });
140
+
141
  $$('.form-list img[src*="calendar.gif"]').each(function (img) {
142
  img.up().insert({ 'top' : img });
143
  });
149
  if ( $('my-reviews-table') ) {
150
  $('my-reviews-table').wrap('div', { 'class' : 'my-reviews-table-wrap' });
151
  }
152
+
153
  $$('.my-account .dashboard .box-title').each(function (elem) {
154
  elem.observe('click', function (e) {
155
  if ( e.target.hasClassName('box-title') ) {
180
  if ( $('product-review-table') ) {
181
  $('product-review-table').wrap('div', {'class' : 'review-table-wrap'}).on('click', 'input[type="radio"]', function (e) {
182
 
183
+ var $this = e.target;
184
 
185
  $this.up('tr').select('td').invoke('removeClassName', 'checked');
186
+ if ( $this.up().hasClassName('value') ) {
187
+ $this.up().addClassName('checked').previousSiblings().each(function (td) {
188
+ if (td.hasClassName('value')) td.addClassName('checked');
189
+ });
190
+ }
 
191
 
192
  });
193
  }
537
  //Slider
538
 
539
  var Carousel = Class.create({
540
+ initialize: function (carousel, itemsContainer, options) {
541
+ this.options = Object.extend({
542
+ visibleElements: 3,
543
+ drawCounter: true,
544
+ threshold: {
545
+ x: 50,
546
+ y: 40
547
+ },
548
+ preventDefaultEvents: false
549
+ }, options || {});
550
+
551
+ this.currentPage = 1;
552
+ this.carousel = carousel;
553
+ this.carouselWidth = this.carousel.getStyle('width') ? this.carousel.getStyle('width').replace('px', '') : $$('body')[0].getStyle('width').replace('px', '');
554
+ this.items = itemsContainer.addClassName('carousel-items');
555
+ this.itemsWrap = this.items.wrap('div', {'class' : 'carousel-items-wrap'});
556
+ this.itemsLength = this.items.childElements().size();
557
+ if (this.options.drawCounter) {
558
+ this.counter = this.carousel.insert(new Element('div', {'class' : 'counter'})).select('.counter')[0];
559
+ }
560
+ this.controls = carousel.select('.controls')[0] || this.carousel.insert({ top: new Element('div', { 'class' : 'controls'}) }).select('.controls')[0];
561
+ this.prevButton = carousel.select('.prev')[0] || this.controls.insert({ top: new Element('span', { 'class' : 'prev'}) }).select('.prev')[0].addClassName('disabled');
562
+ this.nextButton = carousel.select('.next')[0] || this.controls.insert({ top: new Element('span', { 'class' : 'next'}) }).select('.next')[0];
563
+ this.originalCoord = { x: 0, y: 0 };
564
+ this.finalCoord = { x: 0, y: 0 };
565
+
566
+ this.carousel.wrap('div', { 'class' : 'carousel-wrap' });
567
+
568
+ this.nextButton.observe('click', this.moveRight.bind(this));
569
+ this.prevButton.observe('click', this.moveLeft.bind(this));
570
+ this.itemsWrap.observe('touchstart', this.touchStart.bind(this));
571
+ this.itemsWrap.observe('touchmove', this.touchMove.bind(this));
572
+ this.itemsWrap.observe('touchend', this.touchEnd.bind(this));
573
+ Event.observe(window, 'resize', this.orientationChange.bind(this));
574
+ },
575
+
576
+ init: function () {
577
+ this.currentPage = 0;
578
  this.itemPos = 0;
579
+ this.lastItemPos = (this.itemsLength-this.options.visibleElements) * this.carouselWidth/this.options.visibleElements;
580
+ this.itemWidth = this.carouselWidth/this.options.visibleElements + 'px';
581
  this.screens = Math.ceil(this.itemsLength/this.options.visibleElements);
582
 
583
+ this._resizeChilds();
584
+ if (this.options.drawCounter) {
585
+ this.drawCounter();
586
+ }
587
 
588
  return this;
589
  },
590
+
591
  resize: function(visibleElements) {
592
  var transformValue = {};
593
  this.options.visibleElements = visibleElements;
594
+ if (this.options.drawCounter) {
595
+ this.counter.childElements().invoke('remove');
596
+ }
597
  if ( Modernizr.csstransforms3d ) {
598
+ transformValue[transformPref] = 'translateX(' + 0 + ')';
599
  } else if ( Modernizr.csstransforms ) {
600
+ transformValue['left'] = '0';
601
  }
602
  this.items.setStyle(transformValue);
603
  this.prevButton.addClassName('disabled');
604
  this.nextButton.removeClassName('disabled');
605
  this.init();
606
  },
607
+
608
+ _resizeChilds: function () {
609
+ this.items.childElements().each( function(n) {
610
+ n.setStyle({
611
+ 'width': this.itemWidth
612
+ });
613
+ }, this);
614
  },
615
+
616
+ orientationChange: function() {
617
+ this._recalculate();
618
+ this._resizeChilds();
619
+ this.toPage(this.currentPage);
620
+ },
621
+
622
  drawCounter: function () {
623
  if (this.screens > 1) {
624
  if (this.controls)
625
+ this.controls.show();
626
  for (var i = 0; i < this.screens; i++) {
627
  if (i === 0) {
628
  this.counter.insert(new Element('span', {'class': 'active'}));
629
  } else {
630
  this.counter.insert(new Element('span'));
631
  }
632
+ }
633
  } else {
634
  if (this.controls)
635
  this.controls.hide();
636
  }
637
  },
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
638
 
639
+ _recalculate: function() {
640
+ this.carouselWidth = this.carousel.getStyle('width') ? this.carousel.getStyle('width').replace('px', '') : $$('body')[0].getStyle('width').replace('px', '');
641
+ this.lastItemPos = (this.itemsLength-this.options.visibleElements) * this.carouselWidth/this.options.visibleElements;
642
+ this.itemWidth = this.carouselWidth/this.options.visibleElements + 'px';
643
+ },
644
+
645
+ _checkControls: function() {
646
+ if(this.itemPos === 0) {
647
+ this.prevButton.addClassName('disabled');
648
+ } else {
649
+ this.prevButton.removeClassName('disabled');
650
+ }
651
+
652
+ if(Math.abs(this.itemPos) === this.lastItemPos) {
653
+ this.nextButton.addClassName('disabled');
654
+ } else {
655
+ this.nextButton.removeClassName('disabled');
656
+ }
657
+
658
+ if (this.options.drawCounter) {
659
+ this.counter.select('.active')[0].removeClassName('active');
660
+ this.counter.select('span')[this.currentPage].addClassName('active');
661
  }
662
  },
663
+
664
+ _setTransformCoordinates: function() {
665
+ var transformValue = {};
666
+ if ( Modernizr.csstransforms3d ) {
667
+ transformValue[transformPref] = 'translateX(' + this.itemPos + 'px)';
668
+ transformValue['position'] = 'relative';
669
+ } else if ( Modernizr.csstransforms ) {
670
+ transformValue['left'] = this.itemPos + 'px';
671
+ transformValue['position'] = 'relative';
672
+ }
673
+ setTimeout(function() {
674
  this.items.setStyle(transformValue);
675
+ }.bind(this), 1);
676
 
677
+ return this;
678
+ },
 
679
 
680
+ toPage: function (page) {
681
+ this.currentPage = page;
682
+ this.itemPos = -(this.carouselWidth / this.options.visibleElements * this.options.visibleElements) * page;
683
+
684
+ this._setTransformCoordinates();
685
+ this._checkControls();
686
+
687
+ this.finalCoord.x = this.originalCoord.x;
688
+ },
689
+
690
+ moveRight: function () {
691
+ if(Math.abs(this.itemPos) < this.lastItemPos) {
692
+ this.toPage(this.currentPage + 1);
693
+ }
694
+ },
695
+ moveLeft: function () {
696
+ if (this.itemPos !== 0) {
697
+ this.toPage(this.currentPage - 1);
698
  }
699
  },
700
  touchStart: function (e) {
701
+ changeX = 0;
702
+
703
+ this.isScrolling = undefined;
704
+
705
+ this.originalCoord.x = e.targetTouches[0].pageX;
706
+ this.originalCoord.y = e.targetTouches[0].pageY;
707
  },
708
  touchMove: function (e) {
709
  this.finalCoord.x = e.targetTouches[0].pageX;
710
  this.finalCoord.y = e.targetTouches[0].pageY;
711
 
 
712
  changeX = this.originalCoord.x - this.finalCoord.x;
713
+ changeY = this.originalCoord.y - this.finalCoord.y;
714
 
715
+ if ( typeof this.isScrolling == 'undefined') {
716
+ this.isScrolling = !!( this.isScrolling || Math.abs(changeX) < Math.abs(this.finalCoord.y - this.originalCoord.y) );
717
+ }
718
+
719
+ if (!this.isScrolling) {
720
  e.preventDefault();
721
  }
722
  },
724
  if ( e.preventSwipe ) {
725
  return
726
  }
727
+
728
+ if (!this.isScrolling) {
729
+
730
+ if(changeX > this.options.threshold.x && Math.abs(changeY) < this.options.threshold.y) {
731
+ this.moveRight(e);
732
+ }
733
+ if(changeX < this.options.threshold.x * -1 && Math.abs(changeY) < this.options.threshold.y) {
734
+ this.moveLeft(e);
735
+ }
736
+ changeX = changeY = 0;
737
+
738
  }
739
  }
740
  });
762
  }).init();
763
  }
764
 
765
+ if ( $$('.crosssell li').size() > 1 ) {
766
+ var crossSells = new Carousel($$('.crosssell')[0], $$('.crosssell ul')[0], {
767
+ visibleElements: 2,
768
+ preventDefaults: false
769
+ }).init();
770
+ }
771
+
772
  // Swipe Functionality
773
 
774
  var Swipe = Class.create( Carousel, {
873
  this.finalCoord = { x: 0, y: 0 };
874
  this.offset = { x: 0, y: 0 };
875
  this.ret = { x: 0, y: 0 };
876
+ this.hash = window.location.href.split('#')[1];
877
+
878
  this.nextButton.observe('click', this.moveRight.bind(this));
879
  this.prevButton.observe('click', this.moveLeft.bind(this));
880
+
881
  if (this.itemsLength < 2) {
882
  this.controls.hide();
883
  }
896
  });
897
 
898
  this.drawCounter();
899
+
900
+ if (this.hash) {
901
+ this.pos += this.step * this.hash;
902
+
903
+ var transformValue = {};
904
+ if ( Modernizr.csstransforms3d ) {
905
+ this.wrap.setStyle({
906
+ 'webkitTransform' : 'translate3d(' + this.pos*-1 + '%, 0, 0)'
907
+ });
908
+ } else if ( Modernizr.csstransforms ) {
909
+ transformValue[transformPref] = 'translate(' + this.pos*-1 + '%, 0)';
910
+ this.wrap.setStyle(transformValue);
911
+ }
912
+
913
+ if (this.pos.toFixed(2) >= this.lastPos - this.step) {
914
+ this.nextButton.addClassName('disabled');
915
+ }
916
+
917
+ if (this.prevButton.hasClassName('disabled')) {
918
+ this.prevButton.removeClassName('disabled');
919
+ };
920
+
921
+ this.counter.select('.active')[0].removeClassName('active').next(this.hash - 1).addClassName('active');
922
+ }
923
  },
924
  drawCounter: function () {
925
  if (this.itemsLength > 1) {
933
  }
934
  },
935
  moveRight: function (elem) {
936
+ if (this.pos.toFixed(2) < this.lastPos - this.step) {
937
 
 
 
938
  if(elem == event) {
939
  this.items.each(function (elm) {
940
  elm.setStyle({
942
  'webkitTransform' : 'scale3d(1, 1, 1)'
943
  });
944
  });
945
+ } else if (elem) {
946
  elem.setStyle({
947
  'webkitTransition' : '300ms linear',
948
  'webkitTransform' : 'scale3d(1, 1, 1)'
963
  transformValue[transformPref] = 'translate(' + this.pos*-1 + '%, 0)';
964
  this.wrap.setStyle(transformValue);
965
  }
966
+
967
+ if (this.pos.toFixed(2) >= this.lastPos - this.step) {
968
  this.nextButton.addClassName('disabled');
969
  }
970
 
978
  },
979
  moveLeft: function (elem) {
980
 
981
+ if (this.pos.toFixed(2) > 0) {
982
 
983
  if(elem == event) {
984
  this.items.each(function (elm) {
1008
  transformValue[transformPref] = 'translate(' + this.pos*-1 + '%, 0)';
1009
  this.wrap.setStyle(transformValue);
1010
  }
1011
+
1012
+ if (this.pos.toFixed(2) <= 0) {
1013
  this.prevButton.addClassName('disabled');
1014
  }
1015
 
1020
 
1021
  this.counter.select('.active')[0].removeClassName('active').previous().addClassName('active');
1022
  }
 
1023
  },
1024
  gestureStart : function (e) {
1025
  var $this = e.target;
1065
  touchStart: function (e) {
1066
  var $this = e.target;
1067
 
1068
+ this.isScrolling = undefined;
1069
+
1070
  if (e.targetTouches.length != 1) {
1071
  return false
1072
  }
1080
  },
1081
  touchMove: function (e) {
1082
 
1083
+ var $this = e.target;
1084
+
1085
  this.finalCoord.x = e.targetTouches[0].clientX;
1086
  this.finalCoord.y = e.targetTouches[0].clientY;
1087
 
1088
+ if ( typeof this.isScrolling == 'undefined') {
1089
+ this.isScrolling = !!( this.isScrolling || Math.abs(this.finalCoord.x - this.originalCoord.x) < Math.abs(this.finalCoord.y - this.originalCoord.y) );
1090
+ }
1091
+
1092
+ if (!this.isScrolling) {
1093
+ e.preventDefault();
1094
+ }
1095
+
1096
+ if (e.targetTouches.length != 1 || this.scale === 1.0 || this.gestureStart) {
1097
  return false
1098
+ }
1099
 
1100
  e.preventDefault();
1101
 
 
 
1102
  var changeX = this.offset.x + this.finalCoord.x - this.originalCoord.x,
1103
  changeY = this.offset.y + this.finalCoord.y - this.originalCoord.y,
1104
  topX = (this.dimensions.width * (this.scale - 1))/2,
1128
  },
1129
  touchEnd: function (e) {
1130
 
1131
+ if (!this.isScrolling) {
1132
 
1133
+ this.t2 = Date.now();
 
 
 
1134
 
1135
+ var $this = e.target,
1136
+ timeDelta = this.t2 - this.t1,
1137
+ changeX = this.originalCoord.x - this.finalCoord.x,
1138
+ changeY = this.originalCoord.y - this.finalCoord.y;
1139
 
1140
+ if(changeX > this.options.threshold.x && Math.abs(changeY) < 40 && timeDelta < 300) {
1141
+ this.moveRight($this);
1142
+ }
1143
+ if(changeX < this.options.threshold.x * -1 && Math.abs(changeY) < 40 && timeDelta < 300) {
1144
 
1145
+ this.moveLeft($this);
1146
+ }
1147
 
1148
+ if (e.targetTouches.length > 0 || this.gestureStart || timeDelta < 100)
1149
+ return false;
1150
 
1151
+ this.offset.x += this.finalCoord.x - this.originalCoord.x;
1152
+ this.offset.y += this.finalCoord.y - this.originalCoord.y;
 
1153
 
1154
+ var topX = (this.dimensions.width * (this.scale - 1))/2,
1155
+ topY = (this.dimensions.height * (this.scale - 1))/2,
1156
+ moved = false;
1157
 
1158
+ if ( Math.abs(this.offset.x) > topX ) {
1159
+
1160
+ moved = true;
1161
+ $this.setStyle({
1162
+ 'webkitTransition' : '-webkit-transform 100ms ease-out',
1163
+ 'webkitTransform' : 'translate3d(' + (this.offset.x < 0 ? topX*-1 : topX) + 'px,' + this.offset.y + 'px, 0) scale3d(' + this.scale + ',' + this.scale + ',1)'
1164
+ });
1165
 
1166
+ this.offset.x = this.offset.x < 0 ? topX*-1 : topX;
1167
 
1168
+ }
1169
 
1170
+ if ( Math.abs(this.offset.y) > topY ) {
1171
+ moved = true;
1172
+ $this.setStyle({
1173
+ 'webkitTransition' : '-webkit-transform 100ms ease-out',
1174
+ 'webkitTransform' : 'translate3d(' + this.offset.x + 'px,' + (this.offset.y < 0 ? topY*-1 : topY) + 'px, 0) scale3d(' + this.scale + ',' + this.scale + ',1)'
1175
+ });
1176
 
1177
+ this.offset.y = this.offset.y < 0 ? topY*-1 : topY;
1178
 
1179
+ }
1180
 
1181
+ if ( Math.abs(this.offset.x) > topX && Math.abs(this.offset.y) > topY && !moved ) {
1182
 
1183
+ $this.setStyle({
1184
+ 'webkitTransition' : '-webkit-transform 100ms ease-out',
1185
+ 'webkitTransform' : 'translate3d(' + (this.offset.x < 0 ? topX*-1 : topX) + 'px,' + (this.offset.y < 0 ? topY*-1 : topY) + 'px, 0) scale3d(' + this.scale + ',' + this.scale + ',1)'
1186
+ });
1187
+
1188
+ this.offset.x = this.offset.x < 0 ? topX*-1 : topX;
1189
+ this.offset.y = this.offset.y < 0 ? topY*-1 : topY;
1190
 
1191
+ }
 
1192
 
1193
  }
1194
 
1225
  });
1226
  }
1227
 
1228
+ var filters = $$('.filters-block .currently')[0];
1229
+ if ( filters ) {
1230
+ $$('.toolbar')[0].insert({ 'after' : Element.clone(filters, true) });
1231
+ }
1232
+
1233
  });