From f977284b3d3156cb85a82a4a6bbe4ad2688fb6cf Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Fri, 9 Sep 2011 11:41:02 +0000
Subject: [PATCH] // Fix discounts

---
 classes/Discount.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Discount.php b/classes/Discount.php
index 1e77733e7..bf0657a59 100644
--- a/classes/Discount.php
+++ b/classes/Discount.php
@@ -335,7 +335,7 @@ class DiscountCore extends ObjectModel
 		$date_end = strtotime($this->date_to);
 		if ((time() < $date_start OR time() > $date_end) AND !$cart->OrderExists()) return 0;
 
-		if (!$this->isAssociatedToShop($shop->shopID()))
+		if (!$this->isAssociatedToShop($shop->getID()))
 			return 0;
 		$products = $cart->getProducts();
 		$categories = Discount::getCategories((int)$this->id);
@@ -584,7 +584,7 @@ class DiscountCore extends ObjectModel
 				SELECT COUNT(*) 
 				FROM `'._DB_PREFIX_.'discount` 
 				WHERE `active` = 1
-			') > 1);
+			') > 0);
 		return self::$feature_active;
 	}
 }
\ No newline at end of file