// Don't preselect delivery options

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13488 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-21 10:02:56 +00:00
parent 49450cdf05
commit 30cdc8b277
3 changed files with 12 additions and 9 deletions
@@ -2038,7 +2038,7 @@ class CartCore extends ObjectModel
 	* Get the delivery option seleted, or if no delivery option was selected, the cheapest option for each address
 	* @return array delivery option
 	*/
-	public function getDeliveryOption($default_country = null)
+	public function getDeliveryOption($default_country = null, $dontAutoSeletectOptions = false)
 	{
 		$delivery_option_list = $this->getDeliveryOptionList($default_country);

@@ -2057,6 +2057,9 @@ class CartCore extends ObjectModel
 			if ($validated)
 				return $delivery_option;
 		}
+		
+		if ($dontAutoSeletectOptions)
+			return false;

 		// No delivery option selected or delivery option selected is not valid, get the better for all options
 		$delivery_option = array();