[*] BO : display order summary without taxes if needed

PrestaShop · May 9, 2014 · 5c7399c · 5c7399c
1 parent b6b561a
commit 5c7399c
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -1010,8 +1010,14 @@
 										{* Assign order price *}
 										{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
 											{assign var=order_product_price value=($order->total_products)}
+											{assign var=order_discount_price value=$order->total_discounts_tax_excl}
+											{assign var=order_wrapping_price value=$order->total_wrapping_tax_excl}
+											{assign var=order_shipping_price value=$order->total_shipping_tax_excl}
 										{else}
 											{assign var=order_product_price value=$order->total_products_wt}
+											{assign var=order_discount_price value=$order->total_discounts_tax_incl}
+											{assign var=order_wrapping_price value=$order->total_wrapping_tax_incl}
+											{assign var=order_shipping_price value=$order->total_shipping_tax_incl}
 										{/if}
 										<tr id="total_products">
 											<td class="text-right">{l s='Products:'}</td>
@@ -1023,21 +1029,21 @@
 										<tr id="total_discounts" {if $order->total_discounts_tax_incl == 0}style="display: none;"{/if}>
 											<td class="text-right">{l s='Discounts'}</td>
 											<td class="amount text-right">
-												-{displayPrice price=$order->total_discounts_tax_incl currency=$currency->id}
+												-{displayPrice price=$order_discount_price currency=$currency->id}
 											</td>
 											<td class="partial_refund_fields current-edit" style="display:none;"></td>
 										</tr>
 										<tr id="total_wrapping" {if $order->total_wrapping_tax_incl == 0}style="display: none;"{/if}>
 											<td class="text-right">{l s='Wrapping'}</td>
 											<td class="amount text-right">
-												{displayPrice price=$order->total_wrapping_tax_incl currency=$currency->id}
+												{displayPrice price=$order_wrapping_price currency=$currency->id}
 											</td>
 											<td class="partial_refund_fields current-edit" style="display:none;"></td>
 										</tr>
 										<tr id="total_shipping">
 											<td class="text-right">{l s='Shipping'}</td>
 											<td class="amount text-right" >
-												{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}
+												{displayPrice price=$order_shipping_price currency=$currency->id}
 											</td>
 											<td class="partial_refund_fields current-edit" style="display:none;">
 												<div class="input-group">
@@ -1049,12 +1055,14 @@
 												</div>
 											</td>
 										</tr>
-										{* Assign order price *}
 										{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
-											{assign var=order_total_price value=($order->total_paid_tax_excl)}
-										{else}
-											{assign var=order_total_price value=$order->total_paid_tax_incl}
-										{/if}
+			 							<tr id="total_taxes">
+			 								<td class="text-right">{l s='Taxes'}</td>
+			 								<td class="amount text-right" >{displayPrice price=($order->total_paid_tax_incl-$order->total_paid_tax_excl) currency=$currency->id}</td>
+			 								<td class="partial_refund_fields current-edit" style="display:none;"></td>
+			 							</tr>
+			 							{/if}
+										{assign var=order_total_price value=$order->total_paid_tax_incl}
 										<tr id="total_order">
 											<td class="text-right"><strong>{l s='Total'}</strong></td>
 											<td class="amount text-right">