dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix discounts

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8442 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-09 11:41:02 +00:00
parent a886313c61
commit a25f1341ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Discount.php
+2 -2
View File
@@ -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;
}
}