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

// Fix backOffice order cart rules management

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14201 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-03-15 14:42:57 +00:00
parent 9b907fbd31
commit 82e0beb63d
6 changed files with 83 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCartRulesController.php
+9
View File
@@ -89,6 +89,15 @@ class AdminCartRulesControllerCore extends AdminController
$this->afterAdd($current_object);
}
public function processAdd($token)
{
if ($cart_rule = parent::processAdd($token))
$this->context->smarty->assign('new_cart_rule', $cart_rule);
if (Tools::getValue('submitFormAjax'))
$this->redirect_after = false;
return $cart_rule;
}
/* @TODO Move this function into CartRule */
protected function afterAdd($currentObject)
{
controllers/admin/AdminCartsController.php
+2 -2
View File
@@ -388,9 +388,9 @@ class AdminCartsControllerCore extends AdminController
if ($this->tabAccess['edit'] === '1')
{
$errors = array();
if (!$id_cart_rule = Tools::getValue('id_cart_rule') || !$cart_rule = new CartRule((int)$id_cart_rule))
if (!($id_cart_rule = Tools::getValue('id_cart_rule')) || !$cart_rule = new CartRule((int)$id_cart_rule))
$errors[] = Tools::displayError('Invalid voucher');
else if ($err = $cart_rule->checkValidity($this->context))
elseif ($err = $cart_rule->checkValidity($this->context))
$errors[] = $err;
if (!count($errors))
if (!$this->context->cart->addCartRule((int)$cart_rule->id))