Interface_Adminhtml_Default

Version Notes

1.8.1.0

Release Info

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

Code changes from version 1.8.0.0 to 1.8.1.0

Files changed (35) hide show

app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/customer/tab/addresses.phtml +0 -1
app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml +200 -93
app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml +187 -81
app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml +191 -87
app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml +184 -81
app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml +200 -97
app/design/adminhtml/default/default/template/email/order/items.phtml +7 -8
app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml +35 -0
app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml +39 -0
app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +19 -22
app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml +57 -32
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml +159 -142
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml +10 -10
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml +149 -135
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml +149 -135
app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml +156 -141
app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml +12 -11
app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml +155 -140
app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml +10 -10
app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml +22 -4
app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml +1 -1
app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml +6 -6
app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml +58 -39
app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml +10 -10
app/design/adminhtml/default/default/template/system/store/cell.phtml +33 -0
app/design/adminhtml/default/default/template/system/store/container.phtml +37 -0
app/design/adminhtml/default/default/template/system/store/tree.phtml +99 -0
app/design/adminhtml/default/default/template/tax/notifications.phtml +34 -12
package.xml +6 -6
skin/adminhtml/default/default/boxes.css +3 -1

app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml CHANGED Viewed

	@@ -103,12 +103,12 @@
103	</small>
104	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
105	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
106	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
107	<?php endforeach; ?>
108	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
109	<small>
110	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
112	<?php endforeach; ?>
113	</small>
114	<?php endif; ?>
	@@ -137,7 +137,7 @@
137	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
138
139	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
140	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
141	<?php else: ?>
142	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
143	<?php endif; ?>
	@@ -147,7 +147,7 @@
147	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
148	<small>
149	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
150	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
151	<?php endforeach; ?>
152	</small>
153	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -164,7 +164,7 @@
164
165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
166	<br />
167	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
168	<?php endif; ?>
169	<?php endif; ?>
170	</span>
	@@ -273,12 +273,12 @@
273	</small>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
275	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
276	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
277	<?php endforeach; ?>
278	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
279	<small>
280	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
281	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
282	<?php endforeach; ?>
283	</small>
284	<?php endif; ?>
	@@ -306,7 +306,7 @@
306	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
307	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
308	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
309	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
310	<?php else: ?>
311	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
312	<?php endif; ?>
	@@ -318,7 +318,7 @@
318	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
319	<small>
320	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
321	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
322	<?php endforeach; ?>
323	</small>
324	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -334,7 +334,7 @@
334	<?php endif; ?>
335
336	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
337	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
338	<?php endif; ?>
339	<?php endif; ?>
340	</span>
	@@ -361,8 +361,8 @@
361	<td class="a-right last">
362	<?php if ($this->canShowPriceInfo($_item)): ?>
363	<?php echo $this->displayPrices(
364	- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
365	- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
366	) ?>
367	<?php else: ?>
368


103	</small>
104	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
105	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
106	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
107	<?php endforeach; ?>
108	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
109	<small>
110	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
112	<?php endforeach; ?>
113	</small>
114	<?php endif; ?>

137	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
138
139	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
140	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
141	<?php else: ?>
142	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
143	<?php endif; ?>

147	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
148	<small>
149	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
150	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
151	<?php endforeach; ?>
152	</small>
153	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

164
165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
166	<br />
167	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
168	<?php endif; ?>
169	<?php endif; ?>
170	</span>

273	</small>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
275	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
276	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
277	<?php endforeach; ?>
278	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
279	<small>
280	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
281	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
282	<?php endforeach; ?>
283	</small>
284	<?php endif; ?>

306	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
307	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
308	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
309	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
310	<?php else: ?>
311	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
312	<?php endif; ?>

318	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
319	<small>
320	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
321	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
322	<?php endforeach; ?>
323	</small>
324	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

334	<?php endif; ?>
335
336	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
337	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
338	<?php endif; ?>
339	<?php endif; ?>
340	</span>

361	<td class="a-right last">
362	<?php if ($this->canShowPriceInfo($_item)): ?>
363	<?php echo $this->displayPrices(
364	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
365	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
366	) ?>
367	<?php else: ?>
368

app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml CHANGED Viewed

	@@ -101,12 +101,12 @@
101	</small>
102	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
105	<?php endforeach; ?>
106	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
107	<small>
108	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
109	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
110	<?php endforeach; ?>
111	</small>
112	<?php endif; ?>
	@@ -135,7 +135,7 @@
135	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
136
137	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
138	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
139	<?php else: ?>
140	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
141	<?php endif; ?>
	@@ -145,7 +145,7 @@
145	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
146	<small>
147	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
148	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
149	<?php endforeach; ?>
150	</small>
151	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -162,7 +162,7 @@
162
163	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
164	<br />
165	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
166	<?php endif; ?>
167	<?php endif; ?>
168	</span>
	@@ -207,12 +207,12 @@
207	</small>
208	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
209	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
210	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
211	<?php endforeach; ?>
212	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php endif; ?>
	@@ -240,7 +240,7 @@
240	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
241	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
242	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
243	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
244	<?php else: ?>
245	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
246	<?php endif; ?>
	@@ -252,7 +252,7 @@
252	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
253	<small>
254	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
255	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
256	<?php endforeach; ?>
257	</small>
258	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -268,7 +268,7 @@
268	<?php endif; ?>
269
270	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
272	<?php endif; ?>
273	<?php endif; ?>
274	</span>
	@@ -295,8 +295,8 @@
295	<td class="a-right last">
296	<?php if ($this->canShowPriceInfo($_item)): ?>
297	<?php echo $this->displayPrices(
298	- $_item->getBaseRowTotal()-$_item->getBaseDiscountAmount()+$_item->getBaseTaxAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
299	- $_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()
300	) ?>
301	<?php else: ?>
302


101	</small>
102	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
105	<?php endforeach; ?>
106	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
107	<small>
108	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
109	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
110	<?php endforeach; ?>
111	</small>
112	<?php endif; ?>

135	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
136
137	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
138	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
139	<?php else: ?>
140	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
141	<?php endif; ?>

145	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
146	<small>
147	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
148	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
149	<?php endforeach; ?>
150	</small>
151	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

162
163	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
164	<br />
165	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
166	<?php endif; ?>
167	<?php endif; ?>
168	</span>

207	</small>
208	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
209	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
210	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
211	<?php endforeach; ?>
212	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php endif; ?>

240	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
241	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
242	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
243	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
244	<?php else: ?>
245	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
246	<?php endif; ?>

252	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
253	<small>
254	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
255	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
256	<?php endforeach; ?>
257	</small>
258	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

268	<?php endif; ?>
269
270	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
272	<?php endif; ?>
273	<?php endif; ?>
274	</span>

295	<td class="a-right last">
296	<?php if ($this->canShowPriceInfo($_item)): ?>
297	<?php echo $this->displayPrices(
298	+ $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
299	+ $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
300	) ?>
301	<?php else: ?>
302

app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml CHANGED Viewed

	@@ -102,12 +102,12 @@
102	</small>
103	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
104	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
106	<?php endforeach; ?>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
108	<small>
109	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
110	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
111	<?php endforeach; ?>
112	</small>
113	<?php endif; ?>
	@@ -136,7 +136,7 @@
136	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
137
138	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
139	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
140	<?php else: ?>
141	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
142	<?php endif; ?>
	@@ -146,7 +146,7 @@
146	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
147	<small>
148	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
149	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
150	<?php endforeach; ?>
151	</small>
152	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -163,7 +163,7 @@
163
164	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
165	<br />
166	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
167	<?php endif; ?>
168	<?php endif; ?>
169	</span>
	@@ -261,12 +261,12 @@
261	</small>
262	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
263	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
264	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
265	<?php endforeach; ?>
266	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
267	<small>
268	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
269	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
270	<?php endforeach; ?>
271	</small>
272	<?php endif; ?>
	@@ -294,7 +294,7 @@
294	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
295	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
296	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
297	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
298	<?php else: ?>
299	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
300	<?php endif; ?>
	@@ -306,7 +306,7 @@
306	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
307	<small>
308	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
309	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
310	<?php endforeach; ?>
311	</small>
312	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -322,7 +322,7 @@
322	<?php endif; ?>
323
324	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
325	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $~~_incl+$~~_item~~->getWeeeTaxAppliedRowAmount(~~)); ?></span>
326	<?php endif; ?>
327	<?php endif; ?>
328	</span>
	@@ -349,8 +349,8 @@
349	<td class="a-right last">
350	<?php if ($this->canShowPriceInfo($_item)): ?>
351	<?php echo $this->displayPrices(
352	- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
353	- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
354	) ?>
355	<?php else: ?>
356


102	</small>
103	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
104	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
106	<?php endforeach; ?>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
108	<small>
109	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
110	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
111	<?php endforeach; ?>
112	</small>
113	<?php endif; ?>

136	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
137
138	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
139	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
140	<?php else: ?>
141	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
142	<?php endif; ?>

146	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
147	<small>
148	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
149	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
150	<?php endforeach; ?>
151	</small>
152	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

163
164	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
165	<br />
166	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
167	<?php endif; ?>
168	<?php endif; ?>
169	</span>

261	</small>
262	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
263	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
264	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
265	<?php endforeach; ?>
266	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
267	<small>
268	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
269	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
270	<?php endforeach; ?>
271	</small>
272	<?php endif; ?>

294	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
295	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
296	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
297	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
298	<?php else: ?>
299	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
300	<?php endif; ?>

306	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
307	<small>
308	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
309	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
310	<?php endforeach; ?>
311	</small>
312	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

322	<?php endif; ?>
323
324	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
325	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item),$_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
326	<?php endif; ?>
327	<?php endif; ?>
328	</span>

349	<td class="a-right last">
350	<?php if ($this->canShowPriceInfo($_item)): ?>
351	<?php echo $this->displayPrices(
352	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
353	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
354	) ?>
355	<?php else: ?>
356

app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml CHANGED Viewed

	@@ -100,12 +100,12 @@
100	</small>
101	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
102	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
104	<?php endforeach; ?>
105	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
106	<small>
107	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
108	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
109	<?php endforeach; ?>
110	</small>
111	<?php endif; ?>
	@@ -134,7 +134,7 @@
134	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
135
136	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
137	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
138	<?php else: ?>
139	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
140	<?php endif; ?>
	@@ -144,7 +144,7 @@
144	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
145	<small>
146	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
147	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
148	<?php endforeach; ?>
149	</small>
150	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -161,7 +161,7 @@
161
162	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
163	<br />
164	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
165	<?php endif; ?>
166	<?php endif; ?>
167	</span>
	@@ -206,12 +206,12 @@
206	</small>
207	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
208	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
209	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
210	<?php endforeach; ?>
211	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
212	<small>
213	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
215	<?php endforeach; ?>
216	</small>
217	<?php endif; ?>
	@@ -239,7 +239,7 @@
239	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
240	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
241	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
242	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
243	<?php else: ?>
244	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
245	<?php endif; ?>
	@@ -251,7 +251,7 @@
251	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
252	<small>
253	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
254	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
255	<?php endforeach; ?>
256	</small>
257	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -267,7 +267,7 @@
267	<?php endif; ?>
268
269	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
270	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
271	<?php endif; ?>
272	<?php endif; ?>
273	</span>
	@@ -294,8 +294,8 @@
294	<td class="a-right last">
295	<?php if ($this->canShowPriceInfo($_item)): ?>
296	<?php echo $this->displayPrices(
297	- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
298	- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
299	) ?>
300	<?php else: ?>
301


100	</small>
101	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
102	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
104	<?php endforeach; ?>
105	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
106	<small>
107	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
108	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
109	<?php endforeach; ?>
110	</small>
111	<?php endif; ?>

134	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
135
136	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
137	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
138	<?php else: ?>
139	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
140	<?php endif; ?>

144	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
145	<small>
146	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
147	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
148	<?php endforeach; ?>
149	</small>
150	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

161
162	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
163	<br />
164	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
165	<?php endif; ?>
166	<?php endif; ?>
167	</span>

206	</small>
207	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
208	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
209	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
210	<?php endforeach; ?>
211	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
212	<small>
213	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
215	<?php endforeach; ?>
216	</small>
217	<?php endif; ?>

239	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
240	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
241	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
242	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
243	<?php else: ?>
244	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
245	<?php endif; ?>

251	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
252	<small>
253	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
254	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
255	<?php endforeach; ?>
256	</small>
257	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

267	<?php endif; ?>
268
269	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
270	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
271	<?php endif; ?>
272	<?php endif; ?>
273	</span>

294	<td class="a-right last">
295	<?php if ($this->canShowPriceInfo($_item)): ?>
296	<?php echo $this->displayPrices(
297	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
298	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
299	) ?>
300	<?php else: ?>
301

app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml CHANGED Viewed

	@@ -121,12 +121,12 @@
121	</small>
122	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
123	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
125	<?php endforeach; ?>
126	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
127	<small>
128	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
129	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
130	<?php endforeach; ?>
131	</small>
132	<?php endif; ?>
	@@ -155,7 +155,7 @@
155	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
156
157	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
158	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
159	<?php else: ?>
160	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
161	<?php endif; ?>
	@@ -165,7 +165,7 @@
165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
166	<small>
167	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
168	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
169	<?php endforeach; ?>
170	</small>
171	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -182,7 +182,7 @@
182
183	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
184	<br />
185	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
186	<?php endif; ?>
187	<?php endif; ?>
188	</span>
	@@ -269,12 +269,12 @@
269	</small>
270	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
272	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
273	<?php endforeach; ?>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
275	<small>
276	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
277	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
278	<?php endforeach; ?>
279	</small>
280	<?php endif; ?>
	@@ -302,7 +302,7 @@
302	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
303	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
304	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
305	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
306	<?php else: ?>
307	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
308	<?php endif; ?>
	@@ -314,7 +314,7 @@
314	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
315	<small>
316	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
317	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
318	<?php endforeach; ?>
319	</small>
320	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -330,7 +330,7 @@
330	<?php endif; ?>
331
332	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
333	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
334	<?php endif; ?>
335	<?php endif; ?>
336	</span>
	@@ -364,8 +364,8 @@
364	<td class="a-right last">
365	<?php if ($this->canShowPriceInfo($_item)): ?>
366	<?php echo $this->displayPrices(
367	- max(0, $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount()),
368	- max(0, $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount())
369	); ?>
370	<?php else: ?>
371


121	</small>
122	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
123	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
125	<?php endforeach; ?>
126	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
127	<small>
128	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
129	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
130	<?php endforeach; ?>
131	</small>
132	<?php endif; ?>

155	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
156
157	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
158	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
159	<?php else: ?>
160	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
161	<?php endif; ?>

165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
166	<small>
167	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
168	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
169	<?php endforeach; ?>
170	</small>
171	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

182
183	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
184	<br />
185	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
186	<?php endif; ?>
187	<?php endif; ?>
188	</span>

269	</small>
270	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
272	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
273	<?php endforeach; ?>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
275	<small>
276	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
277	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
278	<?php endforeach; ?>
279	</small>
280	<?php endif; ?>

302	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
303	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
304	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
305	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
306	<?php else: ?>
307	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
308	<?php endif; ?>

314	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
315	<small>
316	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
317	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
318	<?php endforeach; ?>
319	</small>
320	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

330	<?php endif; ?>
331
332	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
333	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
334	<?php endif; ?>
335	<?php endif; ?>
336	</span>

364	<td class="a-right last">
365	<?php if ($this->canShowPriceInfo($_item)): ?>
366	<?php echo $this->displayPrices(
367	+ max(0, $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount()),
368	+ max(0, $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount())
369	); ?>
370	<?php else: ?>
371

app/design/adminhtml/default/default/template/customer/tab/addresses.phtml CHANGED Viewed

	@@ -532,7 +532,6 @@ addressesModel.prototype = {
532	if (data.length) {
533	// Create visible selectbox 'region_id' and hidden 'region'
534	var html = '<select name="' + regionIdHtmlName + '" id="' + regionIdHtmlId + '" class="required-entry select" title="' + this.regionElement.title + '">';
535	- html+= '<option value=""></option>';
536	for (var i in data){
537	if(data[i].label) {
538	html+= '<option value="'+data[i].value+'"';


532	if (data.length) {
533	// Create visible selectbox 'region_id' and hidden 'region'
534	var html = '<select name="' + regionIdHtmlName + '" id="' + regionIdHtmlId + '" class="required-entry select" title="' + this.regionElement.title + '">';

535	for (var i in data){
536	if(data[i].label) {
537	html+= '<option value="'+data[i].value+'"';

app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml CHANGED Viewed

@@ -27,113 +27,220 @@
             <?php $_item = $this->getItem() ?>
             <?php $this->setPriceDataObject($_item); ?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <?php if ($this->canParentReturnToStock($_item)) : ?>
-            -
                    <td class="a-center">
                     <?php if ($this->canReturnItemToStock($_item)) : ?>
-            -
                        <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
                     <?php endif; ?>
-            -
                    </td>
-            -
                <?php endif; ?>
-            -
                <td class="a-center">
                 <?php if ($this->canEditQty()) : ?>
-            -
                    <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>"/>
                 <?php else : ?>
-            -
                    <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right">
-            -
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getWeeeTaxAppliedAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


27	<?php $_item = $this->getItem() ?>
28	<?php $this->setPriceDataObject($_item); ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	+ <td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	<span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	<?php endif; ?>
88	+
89	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	<span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
95	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
96	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
97	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <br/>
100	+ <small>
101	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
102	+ <span class="nobr"><?php echo $tax['title']; ?>
103	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
104	+ <br/>
105	+ <?php endforeach; ?>
106	+ </small>
107	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
108	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
109	+ <br/>
110	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><small><?php echo $tax['title']; ?>
112	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
113	+ <br/>
114	+ <?php endforeach; ?>
115	+ <span class="nobr">
116	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
117	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
118	+ </span>
119	+ <?php else: // excl. ?>
120	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
121	+ <?php endif; ?>
122	+ </span>
123	<?php endif; ?>
124	+ </td>
125	+ <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
126	+ <?php if ($this->canParentReturnToStock($_item)) : ?>
127	+ <td class="a-center">
128	<?php if ($this->canReturnItemToStock($_item)) : ?>
129	+ <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
130	+ value="1"<?php if ($_item->getBackToStock()): ?> checked<?php endif; ?>/>
131	<?php endif; ?>
132	+ </td>
133	+ <?php endif; ?>
134	+ <td class="a-center">
135	<?php if ($this->canEditQty()) : ?>
136	+ <input type="text" class="input-text qty-input"
137	+ name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
138	+ value="<?php echo $_item->getQty() * 1 ?>"/>
139	<?php else : ?>
140	+ <?php echo $_item->getQty() * 1 ?>
141	<?php endif; ?>
142	+ </td>
143	+ <td class="a-right">

144
145	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
146	<span class="price-excl-tax">
147	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
148	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
149	+ <?php endif; ?>
150	+
151	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
152	+ <?php
153	+ echo $this->displayPrices(
154	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
155	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
156	+ );
157	+ ?>
158	+ <?php else: ?>
159	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
160	+ <?php endif; ?>
161	+
162	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
163	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
164	+ <small>
165	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
166	+ <span class="nobr"><?php echo $tax['title']; ?>
167	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
168	+ <?php endforeach; ?>
169	+ </small>
170	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
171	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
172	+ <span class="nobr"><small><?php echo $tax['title']; ?>
173	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
174	+ <?php endforeach; ?>
175	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
176	+ <small>
177	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
178	+ <span class="nobr"><?php echo $tax['title']; ?>
179	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
180	+ <?php endforeach; ?>
181	+ </small>
182	+ <?php endif; ?>
183	+
184	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
185	+ <br/>
186	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
187	+ <?php
188	+ echo $this->displayPrices(
189	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
190	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
191	+ );
192	+ ?>
193	+ </span>
194	+ <?php endif; ?>
195	+ <?php endif; ?>
196	+ </span>
197	+ <br/>
198	<?php endif; ?>
199	+
200	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
201	<span class="price-incl-tax">
202	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
203	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
204	+ <?php endif; ?>
205	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
206
207	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
208	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
209	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
210	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
211	+ <br/>
212	+ <small>
213	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	+ <span class="nobr"><?php echo $tax['title']; ?>
215	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
216	+ <br/>
217	+ <?php endforeach; ?>
218	+ </small>
219	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
220	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
221	+ <br/>
222	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
223	+ <span class="nobr"><small><?php echo $tax['title']; ?>
224	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
225	+ <br/>
226	+ <?php endforeach; ?>
227	+ <span class="nobr">
228	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
229	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
230	+ </span>
231	+ <?php else: // excl. ?>
232	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
233	+ <?php endif; ?>
234	+ </span>
235	+ <?php endif; ?>
236	+ </td>
237	+
238	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
239	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
240	+ <td class="a-right last">
241	+ <?php echo $this->displayPrices(
242	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
243	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
244	+ ) ?>
245	+ </td>
246	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml CHANGED Viewed

@@ -29,95 +29,201 @@
             <tr class="border">
                 <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
-            -
                <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
                 <td class="a-right last">
                     <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()-$_item->getBaseDiscountAmount()+$_item->getBaseTaxAmount(),
-            -
                        $_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedAmount
                     ) ?>
                 </td>
             </tr>


29	<tr class="border">
30	<td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	<td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	+ <span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	+ <?php endif; ?>
88	+
89	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	+ <span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+
95	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
96	+
97	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
100	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
101	+ <br/>
102	+ <small>
103	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	+ <span class="nobr"><?php echo $tax['title']; ?>
105	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
106	+ <br/>
107	+ <?php endforeach; ?>
108	+ </small>
109	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
110	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
111	+ <br/>
112	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
113	+ <span class="nobr"><small><?php echo $tax['title']; ?>
114	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
115	+ <br/>
116	+ <?php endforeach; ?>
117	+ <span class="nobr">
118	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
119	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
120	+ </span>
121	+ <?php else: // excl. ?>
122	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
123	+ <?php endif; ?>
124	+ </span>
125	+ <?php endif; ?>
126	</td>
127	+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
128	<td class="a-right">













129
130	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
131	+ <span class="price-excl-tax">
132	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
133	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
134	+ <?php endif; ?>
135	+
136	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
137	+ <?php
138	+ echo $this->displayPrices(
139	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
140	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
141	+ );
142	+ ?>
143	+ <?php else: ?>
144	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
145	+ <?php endif; ?>
146	+
147	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
148	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
149	+ <small>
150	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
151	+ <span class="nobr"><?php echo $tax['title']; ?>
152	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
153	+ <?php endforeach; ?>
154	+ </small>
155	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
156	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
157	+ <span class="nobr"><small><?php echo $tax['title']; ?>
158	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
159	+ <?php endforeach; ?>
160	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
161	+ <small>
162	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
163	+ <span class="nobr"><?php echo $tax['title']; ?>
164	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
165	+ <?php endforeach; ?>
166	+ </small>
167	+ <?php endif; ?>
168	+
169	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
170	+ <br/>
171	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
172	+ <?php
173	+ echo $this->displayPrices(
174	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
175	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
176	+ );
177	+ ?>
178	+ </span>
179	+ <?php endif; ?>
180	+ <?php endif; ?>
181	+ </span>
182	+ <br/>
183	+ <?php endif; ?>
184	+
185	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
186	+ <span class="price-incl-tax">
187	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
188	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
189	+ <?php endif; ?>
190	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
191	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
192	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
193	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
194	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
195	+ <br/>
196	+ <small>
197	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
198	+ <span class="nobr"><?php echo $tax['title']; ?>
199	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
200	+ <br/>
201	+ <?php endforeach; ?>
202	+ </small>
203	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
204	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
205	+ <br/>
206	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
207	+ <span class="nobr"><small><?php echo $tax['title']; ?>
208	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
209	+ <br/>
210	+ <?php endforeach; ?>
211	+ <span class="nobr">
212	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
213	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
214	+ </span>
215	+ <?php else: // excl. ?>
216	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
217	+ <?php endif; ?>
218	+ </span>
219	+ <?php endif; ?>
220	</td>
221	<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
222	<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
223	<td class="a-right last">
224	<?php echo $this->displayPrices(
225	+ $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
226	+ $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
227	) ?>
228	</td>
229	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml CHANGED Viewed

@@ -25,109 +25,213 @@
              */
             ?>
             <?php $_item = $this->getItem() ?>
-            -
            <?php $this->setPriceDataObject($_item)?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
                     </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <td class="a-center">
                 <?php if ($this->canEditQty()) : ?>
-            -
                    <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>"/>
                 <?php else : ?>
-            -
                    <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
                     </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


25	*/
26	?>
27	<?php $_item = $this->getItem() ?>
28	+ <?php $this->setPriceDataObject($_item) ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	+ <td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	<span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	<?php endif; ?>
88	+
89	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	<span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
95	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
96	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
97	+ <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <br/>
100	+ <small>
101	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
102	+ <span class="nobr"><?php echo $tax['title']; ?>
103	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
104	+ <br/>
105	+ <?php endforeach; ?>
106	+ </small>
107	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
108	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
109	+ <br/>
110	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><small><?php echo $tax['title']; ?>
112	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
113	+ <br/>
114	+ <?php endforeach; ?>
115	+ <span class="nobr">
116	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
117	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
118	+ </span>
119	+ <?php else: // excl. ?>
120	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
121	+ <?php endif; ?>
122	</span>
123	<?php endif; ?>
124	+ </td>
125	+ <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
126	+ <td class="a-center">
127	<?php if ($this->canEditQty()) : ?>
128	+ <input type="text" class="input-text qty-input"
129	+ name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
130	+ value="<?php echo $_item->getQty() * 1 ?>"/>
131	<?php else : ?>
132	+ <?php echo $_item->getQty() * 1 ?>
133	<?php endif; ?>
134	+ </td>
135	+ <td class="a-right">
136	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
137	<span class="price-excl-tax">
138	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
139	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
140	+ <?php endif; ?>
141	+
142	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
143	+ <?php
144	+ echo $this->displayPrices(
145	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
146	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
147	+ );
148	+ ?>
149	+ <?php else: ?>
150	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
151	+ <?php endif; ?>
152	+
153	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
154	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
155	+ <small>
156	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
157	+ <span class="nobr"><?php echo $tax['title']; ?>
158	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
159	+ <?php endforeach; ?>
160	+ </small>
161	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
162	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
163	+ <span class="nobr"><small><?php echo $tax['title']; ?>
164	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
165	+ <?php endforeach; ?>
166	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
167	+ <small>
168	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
169	+ <span class="nobr"><?php echo $tax['title']; ?>
170	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
171	+ <?php endforeach; ?>
172	+ </small>
173	+ <?php endif; ?>
174	+
175	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
176	+ <br/>
177	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
178	+ <?php
179	+ echo $this->displayPrices(
180	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
181	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
182	+ );
183	+ ?>
184	+ </span>
185	+ <?php endif; ?>
186	+ <?php endif; ?>
187	+ </span>
188	+ <br/>
189	<?php endif; ?>
190	+
191	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
192	<span class="price-incl-tax">
193	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
194	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
195	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
196	+ <?php endif; ?>
197
198	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
199	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
200	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
201	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
202	+ <br/>
203	+ <small>
204	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
205	+ <span class="nobr"><?php echo $tax['title']; ?>
206	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
207	+ <br/>
208	+ <?php endforeach; ?>
209	+ </small>
210	+ <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
211	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
212	+ <br/>
213	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	+ <span class="nobr"><small><?php echo $tax['title']; ?>
215	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
216	+ <br/>
217	+ <?php endforeach; ?>
218	+ <span class="nobr">
219	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
220	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
221	+ </span>
222	+ <?php else: // excl. ?>
223	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
224	+ <?php endif; ?>


225
226	</span>
227	<?php endif; ?>
228	+ </td>
229	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
230	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
231	+ <td class="a-right last">
232	+ <?php echo $this->displayPrices(
233	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
234	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
235	+ ) ?>
236	+ </td>
237	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml CHANGED Viewed

@@ -29,95 +29,198 @@
             <tr class="border">
                 <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
-            -
                <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
                 <td class="a-right last">
                     <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getWeeeTaxAppliedAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedAmount()
                     ) ?>
                 </td>
             </tr>


29	<tr class="border">
30	<td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	<td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	+ <span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	+ <?php endif; ?>
88	+
89	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	+ <span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
95	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
96	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
97	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <br/>
100	+ <small>
101	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
102	+ <span class="nobr"><?php echo $tax['title']; ?>
103	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
104	+ <br/>
105	+ <?php endforeach; ?>
106	+ </small>
107	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
108	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
109	+ <br/>
110	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><small><?php echo $tax['title']; ?>
112	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
113	+ <br/>
114	+ <?php endforeach; ?>
115	+ <span class="nobr">
116	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
117	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
118	+ </span>
119	+ <?php else: // excl. ?>
120	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
121	+ <?php endif; ?>
122	+ </span>
123	+ <?php endif; ?>
124	</td>
125	+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
126	<td class="a-right">
127	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
128	+ <span class="price-excl-tax">
129	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
130	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
131	+ <?php endif; ?>
132	+
133	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
134	+ <?php
135	+ echo $this->displayPrices(
136	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
137	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
138	+ );
139	+ ?>
140	+ <?php else: ?>
141	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
142	+ <?php endif; ?>
143	+
144	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
145	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
146	+ <small>
147	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
148	+ <span class="nobr"><?php echo $tax['title']; ?>
149	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
150	+ <?php endforeach; ?>
151	+ </small>
152	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
153	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
154	+ <span class="nobr"><small><?php echo $tax['title']; ?>
155	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
156	+ <?php endforeach; ?>
157	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
158	+ <small>
159	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
160	+ <span class="nobr"><?php echo $tax['title']; ?>
161	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
162	+ <?php endforeach; ?>
163	+ </small>
164	+ <?php endif; ?>
165	+
166	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
167	+ <br/>
168	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
169	+ <?php
170	+ echo $this->displayPrices(
171	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
172	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
173	+ );
174	+ ?>
175	+ </span>
176	+ <?php endif; ?>
177	+ <?php endif; ?>
178	+ </span>
179	+ <br/>
180	+ <?php endif; ?>
181
182	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
183	+ <span class="price-incl-tax">
184	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
185	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
186	+ <?php endif; ?>
187	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
188	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
189	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
190	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
191	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
192	+ <br/>
193	+ <small>
194	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
195	+ <span class="nobr"><?php echo $tax['title']; ?>
196	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
197	+ <br/>
198	+ <?php endforeach; ?>
199	+ </small>
200	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
201	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
202	+ <br/>
203	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
204	+ <span class="nobr"><small><?php echo $tax['title']; ?>
205	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
206	+ <br/>
207	+ <?php endforeach; ?>
208	+ <span class="nobr">
209	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
210	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
211	+ </span>
212	+ <?php else: // excl. ?>
213	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
214	+ <?php endif; ?>
215	+ </span>
216	+ <?php endif; ?>
217	</td>
218	<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
219	<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
220	<td class="a-right last">
221	<?php echo $this->displayPrices(
222	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
223	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
224	) ?>
225	</td>
226	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml CHANGED Viewed

@@ -27,120 +27,223 @@
             <?php $_item = $this->getItem() ?>
             <?php $this->setPriceDataObject($_item) ?>
             <tr<?php if ($this->canDisplayGiftmessage()): ?> class="border"<?php endif; ?>>
-            -
                <td class="giftmessage-single-item">
-            -
                    <?php if ($this->canDisplayContainer()): ?>
-            -
                    <div id="<?php echo $this->getHtmlId() ?>" class="item-container">
                     <?php endif; ?>
                     <div class="item-text">
                         <?php echo $this->getColumnHtml($_item, 'downloadable') ?>
                     </div>
                     <?php if ($this->canDisplayContainer()): ?>
-            -
                    </div>
-            -
                    <?php endif ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $_item->getStatus() ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('original_price') ?></td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>

Interface_Adminhtml_Default - Version 1.8.1.0

Version Notes

Release Info

Code changes from version 1.8.0.0 to 1.8.1.0