//// Merge -> revision 8290

2011-09-01 09:53:43 +00:00
parent b973c3ef12
commit a7ad178f28
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');