From 113d3a5174f58409ac83aa76597b95205dd4f674 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Fri, 27 Jan 2012 14:38:04 +0000
Subject: [PATCH] // Small fixes for cart rules

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12756 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/front/OrderOpcController.php    | 2 +-
 controllers/front/ParentOrderController.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index fbf016757..e41bea4f7 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -43,7 +43,7 @@ class OrderOpcControllerCore extends ParentOrderController
 		
 		$this->context->smarty->assign('is_multi_address_delivery', $this->context->cart->isMultiAddressDelivery());
 		
-		$this->isLogged = (bool)($this->context->customer->id && Customer::customerIdExistsStatic((int)($this->context->cookie->id_customer)));
+		$this->isLogged = (bool)($this->context->customer->id && Customer::customerIdExistsStatic((int)$this->context->cookie->id_customer));
 
 		if ($this->context->cart->nbProducts())
 		{
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index a850feef3..3c2372455 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -92,13 +92,13 @@ class ParentOrderControllerCore extends FrontController
 			{
 				if (Tools::isSubmit('submitAddDiscount'))
 				{
-					if (!($code = Tools::getValue('discount_name')))
+					if (!($code = trim(Tools::getValue('discount_name'))))
 						$this->errors[] = Tools::displayError('You must enter a voucher code');
 					elseif (!Validate::isDiscountName($code))
 						$this->errors[] = Tools::displayError('Voucher code invalid');
 					else
 					{
-						if ($cartRule = new CartRule(CartRule::getIdByCode($code)) && Validate::isLoadedObject($cartRule))
+						if (($cartRule = new CartRule(CartRule::getIdByCode($code))) && Validate::isLoadedObject($cartRule))
 						{
 							if ($error = $cartRule->checkValidity($this->context))
 								$this->errors[] = $error;