//// Merge -> revision 8290

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-01 09:53:43 +00:00
parent d27c0b3b7d
commit c2258ae8e9
50 changed files with 431 additions and 256 deletions
@@ -1151,7 +1151,10 @@ class CartCore extends ObjectModel
 						$tmp = $shipping;

 					if ($shipping <= $tmp)
+					{
 						$id_carrier = (int)($row['id_carrier']);
+						$tmp = $shipping;
+				}
 				}
 				else // by price
 				{
@@ -1161,10 +1164,13 @@ class CartCore extends ObjectModel
 						$tmp = $shipping;

 					if ($shipping <= $tmp)
+					{
 						$id_carrier = (int)($row['id_carrier']);
+						$tmp = $shipping;
 				}
 			}
 		}
+		}

 		if (empty($id_carrier))
 			$id_carrier = Configuration::get('PS_CARRIER_DEFAULT');