[-] FO : Check for cart rules before diplaying shopping cart in OPC

controllers/front/OrderOpcController.php

@@ -290,6 +290,17 @@ class OrderOpcControllerCore extends ParentOrderController
 	{
 		parent::initContent();
 		
+		/* id_carrier is not defined in database before choosing a carrier, set it to a default one to match a potential cart _rule */
+		if (empty($this->context->cart->id_carrier))
+		{
+			$checked = $this->context->cart->simulateCarrierSelectedOutput();
+			$checked = ((int)Cart::desintifier($checked));
+			$this->context->cart->id_carrier = $checked;
+			$this->context->cart->update();
+			CartRule::autoRemoveFromCart($this->context);
+			CartRule::autoAddToCart($this->context);
+		}				
+
 		// SHOPPING CART
 		$this->_assignSummaryInformations();
 		// WRAPPING AND TOS
@@ -337,9 +348,9 @@ class OrderOpcControllerCore extends ParentOrderController
 		/* Load guest informations */
 		if ($this->isLogged && $this->context->cookie->is_guest)
 			$this->context->smarty->assign('guestInformations', $this->_getGuestInformations());
-
+		// ADDRESS
 		if ($this->isLogged)
-			$this->_assignAddress(); // ADDRESS
+			$this->_assignAddress(); 
 		// CARRIER
 		$this->_assignCarrier();
 		// PAYMENT

controllers/front/ParentOrderController.php

@@ -460,7 +460,7 @@ class ParentOrderControllerCore extends FrontController
 		$carriers = $this->context->cart->simulateCarriersOutput();
 		$checked = $this->context->cart->simulateCarrierSelectedOutput();
 		$delivery_option_list = $this->context->cart->getDeliveryOptionList();
-		$this->setDefaultCarrierSelection($this->context->cart->getDeliveryOptionList());
+		$this->setDefaultCarrierSelection($delivery_option_list);
 		
 		$this->context->smarty->assign(array(
 			'address_collection' => $this->context->cart->getAddressCollection(),