[-] FO : fixed warning when a discount wasn't associated to any reduction type (shipping, currency, percentage)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16712 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-06 09:47:53 +00:00
parent 0b374458ec
commit 6ea5d45b39
2 changed files with 4 additions and 1 deletions
@@ -252,6 +252,7 @@ class CartRuleCore extends ObjectModel
 			$cart_rule['value'] = 0;
 			$cart_rule['minimal'] = $cart_rule['minimum_amount'];
 			$cart_rule['cumulable'] = !$cart_rule['cart_rule_restriction'];
+			$cart_rule['id_discount_type'] = false;
 			if ($cart_rule['free_shipping'])
 				$cart_rule['id_discount_type'] = Discount::FREE_SHIPPING;
 			elseif ($cart_rule['reduction_percent'] > 0)
@@ -52,8 +52,10 @@
 					{$discountDetail.value|escape:'htmlall':'UTF-8'}%
 				{elseif $discountDetail.id_discount_type == 2}
 					{convertPrice price=$discountDetail.value}
-				{else}
+				{elseif $discountDetail.id_discount_type == 3}
 					{l s='Free shipping'}
+				{else}
+					-
 				{/if}
 			</td>
 			<td class="discount_minimum">