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

// Some improvements on BackOffice orders

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9810 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2011-11-02 19:19:03 +00:00
parent 12aa189913
commit fe7dfe0460
8 changed files with 105 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCartsController.php
+9 -4
View File
@@ -306,9 +306,9 @@ class AdminCartsController extends AdminController
}
public function ajaxProcessDeleteDiscount()
public function ajaxProcessDeleteVoucher()
{
if ($this->context->cart->deleteDiscount((int)Tools::getValue('id_voucher')))
if ($this->context->cart->removeCartRule((int)Tools::getValue('id_cart_rule')))
echo Tools::jsonEncode($this->ajaxReturnVars());
}
@@ -317,9 +317,9 @@ class AdminCartsController extends AdminController
$errors = array();
$customer = new Customer((int)$this->context->cart->id_customer);
if (!$id_cart_rule = Tools::getValue('id_voucher') OR !$cartRule = new CartRule((int)$id_cart_rule))
if (!$id_cart_rule = Tools::getValue('id_cart_rule') OR !$cartRule = new CartRule((int)$id_cart_rule))
$errors[] = Tools::displayError('Invalid voucher');
elseif ($err = $this->context->cart->checkDiscountValidity($cartRule, $this->context->cart->getDiscounts(), $this->context->cart->getOrderTotal(), $this->context->cart->getProducts(), true, $customer))
elseif ($err = $cartRule->checkValidity($this->context))
$errors[] = $err;
if (!sizeof($errors))
if (!$this->context->cart->addCartRule((int)$cartRule->id))
@@ -419,6 +419,11 @@ class AdminCartsController extends AdminController
echo Tools::jsonEncode($this->ajaxReturnVars());
}
public function ajaxProcessUpdateProductPrice()
{
}
public static function getOrderTotalUsingTaxCalculationMethod($id_cart)
{
return Cart::getTotalCart($id_cart, true);