From 853aaeb5e43233696b1706955d08b60cb74bc13b Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Fri, 9 Nov 2012 14:20:08 +0000
Subject: [PATCH] [-] FO : restored the display of available cart rules in the
 cart #PSCFV-5473 (clean)

---
 controllers/front/ParentOrderController.php | 2 +-
 themes/default/shopping-cart.tpl            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index aa19154f5..5fd4b58b3 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -335,7 +335,7 @@ class ParentOrderControllerCore extends FrontController
 			'CUSTOMIZE_FILE' => Product::CUSTOMIZE_FILE,
 			'CUSTOMIZE_TEXTFIELD' => Product::CUSTOMIZE_TEXTFIELD,
 			'lastProductAdded' => $this->context->cart->getLastProduct(),
-			'displayVouchers' => CartRule::getCustomerCartRules($this->context->language->id, (isset($this->context->customer->id) ? $this->context->customer->id : 0)),
+			'displayVouchers' => CartRule::getCustomerCartRules($this->context->language->id, (isset($this->context->customer->id) ? $this->context->customer->id : 0), true, true, true, $this->context->cart),
 			'currencySign' => $this->context->currency->sign,
 			'currencyRate' => $this->context->currency->conversion_rate,
 			'currencyFormat' => $this->context->currency->format,
diff --git a/themes/default/shopping-cart.tpl b/themes/default/shopping-cart.tpl
index 31f574dc7..8621332c9 100644
--- a/themes/default/shopping-cart.tpl
+++ b/themes/default/shopping-cart.tpl
@@ -196,7 +196,7 @@
 						<h4 class="title_offers">{l s='Take advantage of our offers:'}</h4>
 						<div id="display_cart_vouchers">
 						{foreach $displayVouchers as $voucher}
-							<span onclick="$('#discount_name').val('{$voucher.code}');return false;" class="voucher_name">{$voucher.code}</span> - {$voucher.name} <br />
+							{if $voucher.code != ''}<span onclick="$('#discount_name').val('{$voucher.code}');return false;" class="voucher_name">{$voucher.code}</span> - {/if}{$voucher.name}<br />
 						{/foreach}
 						</div>
 					{/if}