diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 3704de6d3..e394ee408 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -94,8 +94,6 @@ class OrderControllerCore extends ParentOrderController */ public function initContent() { - global $isVirtualCart; - parent::initContent(); if (Tools::isSubmit('ajax') && Tools::getValue('method') == 'updateExtraCarrier') @@ -117,7 +115,7 @@ class OrderControllerCore extends ParentOrderController } if ($this->nbProducts) - $this->context->smarty->assign('virtual_cart', $isVirtualCart); + $this->context->smarty->assign('virtual_cart', $this->context->cart->isVirtualCart()); // 4 steps to the order switch ((int)$this->step) @@ -225,12 +223,11 @@ class OrderControllerCore extends ParentOrderController */ public function autoStep() { - global $isVirtualCart; if ($this->step >= 2 && (!$this->context->cart->id_address_delivery || !$this->context->cart->id_address_invoice)) Tools::redirect('index.php?controller=order&step=1'); - if ($this->step > 2 && !$isVirtualCart && count($this->context->cart->getDeliveryOptionList()) == 0) + if ($this->step > 2 && !$this->context->cart->isVirtualCart() && count($this->context->cart->getDeliveryOptionList()) == 0) Tools::redirect('index.php?controller=order&step=2'); $delivery = new Address((int)$this->context->cart->id_address_delivery); diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php index 8b6f6d0a0..7e9bc39ca 100644 --- a/controllers/front/OrderOpcController.php +++ b/controllers/front/OrderOpcController.php @@ -40,7 +40,7 @@ class OrderOpcControllerCore extends ParentOrderController parent::init(); if ($this->nbProducts) - $this->context->smarty->assign('virtual_cart', false); + $this->context->smarty->assign('virtual_cart', $this->context->cart->isVirtualCart()); $this->context->smarty->assign('is_multi_address_delivery', $this->context->cart->isMultiAddressDelivery() || ((int)Tools::getValue('multi-shipping') == 1)); $this->context->smarty->assign('open_multishipping_fancybox', (int)Tools::getValue('multi-shipping') == 1); diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php index 3a02dd9dd..15d8e4289 100644 --- a/controllers/front/ParentOrderController.php +++ b/controllers/front/ParentOrderController.php @@ -56,8 +56,6 @@ class ParentOrderControllerCore extends FrontController header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); $this->nbProducts = $this->context->cart->nbProducts(); - - global $isVirtualCart; if (!$this->context->customer->isLogged(true) && $this->context->getMobileDevice() && Tools::getValue('step')) Tools::redirect($this->context->link->getPageLink('authentication', true, (int)$this->context->language->id, $params));