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

[-] BO : Incorrect CartRule value

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10650 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-11-25 10:34:43 +00:00
parent 0a9889f3af
commit 39ee88bdf2
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/admin/AdminOrdersController.php
View File

@@ -919,6 +919,7 @@ class AdminOrdersControllerCore extends AdminController
$cart_rule->reduction_product = $product->id;
$cart_rule->reduction_amount = $reduction_tax_incl;
$cart_rule->reduction_currency = $order->id_currency;
$cart_rule->reduction_tax = true;
$cart_rule->active = 1;
$cart_rule->add();
@@ -950,7 +951,7 @@ class AdminOrdersControllerCore extends AdminController
$cart_rule->add();
$cart->addCartRule($cart_rule->id);
//$order->addCartRule($cart_rule->id, $cart_rule->name, $cart_rule->getContextualValue(true));
$order->addCartRule($cart_rule->id, $cart_rule->name, $cart_rule->getContextualValue(true));
}
if (Tools::isSubmit('add_invoice'))
$invoice_informations = $_POST['add_invoice'];
@@ -959,6 +960,7 @@ class AdminOrdersControllerCore extends AdminController
Configuration::updateValue('PS_INVOICE_START_NUMBER', false);
else
$order_invoice->number = Order::getLastInvoiceNumber() + 1;
$order_invoice->total_paid_tax_excl = Tools::ps_round((float)$cart->getOrderTotal(false, Cart::BOTH), 2);
$order_invoice->total_paid_tax_incl = Tools::ps_round((float)$cart->getOrderTotal($use_taxes, Cart::BOTH), 2);
$order_invoice->total_products = (float)$cart->getOrderTotal(false, Cart::ONLY_PRODUCTS);
@@ -1009,6 +1011,13 @@ class AdminOrdersControllerCore extends AdminController
$order->total_paid_tax_excl += Tools::ps_round((float)($cart->getOrderTotal(false, Cart::BOTH)), 2);
$order->total_paid_tax_incl += Tools::ps_round((float)($cart->getOrderTotal($use_taxes, Cart::BOTH)), 2);
d($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS));
// discount
$order->total_discounts += (float)abs($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS));
$order->total_discounts_tax_excl += (float)abs($cart->getOrderTotal(false, Cart::ONLY_DISCOUNTS));
$order->total_discounts_tax_incl += (float)abs($cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS));
// Save changes of order
$order->update();
@@ -1323,3 +1332,4 @@ class AdminOrdersControllerCore extends AdminController
return $products;
}
}