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

[-] BO : Product filter initialization fixed in cart rules #PSCFV-2524

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15611 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-05-22 11:54:54 +00:00
parent 859f360783
commit 7f6d1a17d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCartRulesController.php
+2 -2
View File
@@ -479,13 +479,13 @@ class AdminCartRulesControllerCore extends AdminController
if (Validate::isUnsignedId($current_object->gift_product) &&
($product = new Product($current_object->gift_product, false, $this->context->language->id)) &&
Validate::isLoadedObject($product))
$gift_product_filter = trim($product->reference.' '.$product->name);
$gift_product_filter = (!empty($product->reference) ? $product->reference : $product->name);
$reduction_product_filter = '';
if (Validate::isUnsignedId($current_object->reduction_product) &&
($product = new Product($current_object->reduction_product, false, $this->context->language->id)) &&
Validate::isLoadedObject($product))
$reduction_product_filter = trim($product->reference.' '.$product->name);
$reduction_product_filter = (!empty($product->reference) ? $product->reference : $product->name);
$product_rule_groups = $this->getProductRuleGroupsDisplay($current_object);