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;