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

[-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-02-13 17:47:40 +00:00
parent 1c6b736418
commit ec0798fe8a
5 changed files with 515 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCartRulesController.php
+6 -6
View File
@@ -239,7 +239,7 @@ class AdminCartRulesControllerCore extends AdminController
foreach ($results as $row)
$attributes[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $attributes);
$choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
$choose_content = $this->createTemplate('controllers/cart_rules/product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break;
case 'products':
@@ -253,7 +253,7 @@ class AdminCartRulesControllerCore extends AdminController
foreach ($results as $row)
$products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $products);
$choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
$choose_content = $this->createTemplate('controllers/cart_rules/product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break;
case 'manufacturers':
@@ -265,7 +265,7 @@ class AdminCartRulesControllerCore extends AdminController
foreach ($results as $row)
$products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $products);
$choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
$choose_content = $this->createTemplate('controllers/cart_rules/product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break;
case 'suppliers':
@@ -277,7 +277,7 @@ class AdminCartRulesControllerCore extends AdminController
foreach ($results as $row)
$products[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $products);
$choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
$choose_content = $this->createTemplate('controllers/cart_rules/product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break;
case 'categories':
@@ -291,12 +291,12 @@ class AdminCartRulesControllerCore extends AdminController
foreach ($results as $row)
$categories[in_array($row['id'], $selected) ? 'selected' : 'unselected'][] = $row;
Context::getContext()->smarty->assign('product_rule_itemlist', $categories);
$choose_content = $this->createTemplate('product_rule_itemlist.tpl')->fetch();
$choose_content = $this->createTemplate('controllers/cart_rules/product_rule_itemlist.tpl')->fetch();
Context::getContext()->smarty->assign('product_rule_choose_content', $choose_content);
break;
}
return $this->createTemplate('product_rule.tpl')->fetch();
return $this->createTemplate('controllers/cart_rules/product_rule.tpl')->fetch();
}
public function ajaxProcess()