From 80f6f4e223c0596b5604b43ff09b594bd9eb236f Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 14 Oct 2013 15:34:47 +0200
Subject: [PATCH] [-] FO : Fix bug #PSCFV-10688, bad priceDisplay in
 order-carrier

---
 themes/default/order-carrier.tpl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index aac6efad1..9a8f40adc 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -171,10 +171,13 @@
 								<td>
 								<div class="delivery_option_price">
 									{if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
+
 										{if $use_taxes == 1}
-											{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
-										{else}
-											{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
+											{if $priceDisplay == 1}
+												{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
+											{else}
+												{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
+											{/if}
 										{/if}
 									{else}
 										{l s='Free'}