From 5a15d466ea9c617567e8e3eb80dd92fdec3b8322 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Mon, 30 Apr 2012 12:51:20 +0000 Subject: [PATCH] [-] FO : Fixed bug #PSCFV-1251 & #PSCFV-1727 --- 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 6c82fc690..a498c7895 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -410,7 +410,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 || !$this->context->cart->id_address_invoice || !Validate::isLoadedObject($address_delivery) || !Validate::isLoadedObject($address_invoice) || $address_invoice->deleted || $address_delivery->deleted) return '

'.Tools::displayError('Error: please choose an address').'

'; - if (count($this->context->cart->getDeliveryOptionList()) == 0) + if (count($this->context->cart->getDeliveryOptionList()) == 0 && !$this->context->cart->isVirtualCart()) { if ($this->context->cart->isMultiAddressDelivery()) return '

'.Tools::displayError('Error: There are no carriers available that deliver to some of your addresses').'

';