Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

classes/Carrier.php

@@ -1195,7 +1195,7 @@ class CarrierCore extends ObjectModel
 			$carrier_list = $available_carrier_list;
 			 								
 		if (isset($warehouse_carrier_list))
-			$carrier_list = array_intersect($carrier_list, $warehouse_carrier_list);						
+			$carrier_list = array_intersect($carrier_list, $warehouse_carrier_list);
 
 		if ($product->width > 0 || $product->height > 0 || $product->depth > 0 || $product->weight > 0)
 		{

controllers/front/AuthController.php

@@ -298,15 +298,15 @@ class AuthControllerCore extends FrontController
 					$this->context->cart = new Cart($id_cart);
 				else
 				{
-					$this->context->cart->id_carrier = 0;								
+					$this->context->cart->id_carrier = 0;
 					$this->context->cart->setDeliveryOption(null);
-					$this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)($customer->id));					
+					$this->context->cart->id_address_delivery = Address::getFirstCustomerAddressId((int)($customer->id));
-					$this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id));					
+					$this->context->cart->id_address_invoice = Address::getFirstCustomerAddressId((int)($customer->id));
 				}
-				$this->context->cart->id_customer = (int)$customer->id;				
+				$this->context->cart->id_customer = (int)$customer->id;
 				$this->context->cart->secure_key = $customer->secure_key;
-				$this->context->cart->save();				
+				$this->context->cart->save();
-				$this->context->cookie->id_cart = (int)$this->context->cart->id;				
+				$this->context->cookie->id_cart = (int)$this->context->cart->id;
 				$this->context->cookie->update();
 				$this->context->cart->autosetProductAddress();
 
@@ -396,7 +396,7 @@ class AuthControllerCore extends FrontController
 				$error_phone = true;
 			elseif (((Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && Configuration::get('PS_ORDER_PROCESS_TYPE') && Tools::getValue('email_create')))
 					&& (!Tools::getValue('phone') && !Tools::getValue('phone_mobile')))
-				$error_phone = true;				
+				$error_phone = true;
 		}
 
 		if ($error_phone)
@@ -598,7 +598,7 @@ class AuthControllerCore extends FrontController
 								Tools::redirect('index.php?controller=address');
 								
 							if ($back = Tools::getValue('back'))
-								Tools::redirect(html_entity_decode($back));								
+								Tools::redirect(html_entity_decode($back));
 
 							// redirection: if cart is not empty : redirection to the cart
 							if (count($this->context->cart->getProducts(true)) > 0)

controllers/front/OrderOpcController.php

@@ -289,6 +289,17 @@ class OrderOpcControllerCore extends ParentOrderController
 	public function initContent()
 	{
 		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();
@@ -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(),

themes/default/js/order-opc.js

@@ -629,7 +629,7 @@ $(function() {
 						
 						// force to refresh carrier list
 						if (isGuest)
-						{						
+						{
 							isLogged = 1;
 							$('#opc_account_saved').fadeIn('slow');
 							$('#submitAccount').hide();