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 '
'.Tools::displayError('Error: please choose an address').'
'; - if (!$this->context->cart->delivery_option AND !$this->context->cart->isVirtualCart()) + if (!$this->context->cart->getDeliveryOption() AND !$this->context->cart->isVirtualCart()) return ''.Tools::displayError('Error: please choose a carrier').'
'; if (!$this->context->cart->id_currency) return ''.Tools::displayError('Error: no currency has been selected').'
';