From b08563276b1e798885b6ad02107f853403498bf6 Mon Sep 17 00:00:00 2001
From: mDeflotte <maxence.deflotte@prestashop.com>
Date: Wed, 30 Nov 2011 14:56:33 +0000
Subject: [PATCH] // BugFix : message "Please chose a carrier" but a delivery
 option is setted.

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10807 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/front/OrderOpcController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 33fdf1517..500f900a2 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -392,7 +392,7 @@ class OrderOpcControllerCore extends ParentOrderController
 		$address_invoice = ($this->context->cart->id_address_delivery == $this->context->cart->id_address_invoice ? $address_delivery : new Address($this->context->cart->id_address_invoice));
 		if (!$this->context->cart->id_address_delivery OR !$this->context->cart->id_address_invoice OR !Validate::isLoadedObject($address_delivery) OR !Validate::isLoadedObject($address_invoice) OR $address_invoice->deleted OR $address_delivery->deleted)
 			return '<p class="warning">'.Tools::displayError('Error: please choose an address').'</p>';
-		if (!$this->context->cart->delivery_option AND !$this->context->cart->isVirtualCart())
+		if (!$this->context->cart->getDeliveryOption() AND !$this->context->cart->isVirtualCart())
 			return '<p class="warning">'.Tools::displayError('Error: please choose a carrier').'</p>';
 		if (!$this->context->cart->id_currency)
 			return '<p class="warning">'.Tools::displayError('Error: no currency has been selected').'</p>';