// Problem with product return

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11566 b9a71923-0436-4b27-9f14-aed3839534dd

classes/Cart.php

@@ -1933,10 +1933,10 @@ class CartCore extends ObjectModel
 			if (!isset($delivery_option[$id_address]))
 				foreach ($options as $key => $option)
 					if ($option['is_best_price'])
-								{
-									$delivery_option[$id_address] = $key;
-									break;
-								}
+					{
+						$delivery_option[$id_address] = $key;
+						break;
+					}
 
 		if (count($delivery_option) == 1)
 			$this->id_carrier = $this->getIdCarrierFromDeliveryOption($delivery_option);

classes/Discount.php

@@ -204,7 +204,7 @@ class DiscountCore extends CartRule
 	public static function createOrderDiscount($order, $productList, $qtyList, $name, $shipping_cost = false, $id_category = 0, $subcategory = 0)
 	{
 		// Todo
-		die ('TODO');
+		//die ('TODO');
 		
 		$languages = Language::getLanguages($order);
 		$products = $order->getProducts(false, $productList, $qtyList);