// retrocompatibility theme 1.4 + carrier

2012-05-21 18:09:16 +00:00
parent 3e5c90d36f
commit d9a319b7b6
1 changed files with 2 additions and 2 deletions
@@ -155,9 +155,9 @@ class OrderControllerCore extends ParentOrderController
 				// Check the delivery option is setted
 				if (!$this->context->cart->isVirtualCart())
 				{
-					if (!Tools::getValue('delivery_option'))
+					if (!Tools::getValue('delivery_option') && !Tools::getValue('id_carrier'))
 						Tools::redirect('index.php?controller=order&step=2');
-					else
+					elseif (!Tools::getValue('id_carrier'))
 					{
 						foreach (Tools::getValue('delivery_option') as $delivery_option)
 						if (empty($delivery_option))