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

// Fix PSCFV-3840

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17136 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-08-31 14:52:54 +00:00
parent 146abf31de
commit 6fbaafca4c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+2 -2
View File
@@ -1228,14 +1228,14 @@ class CartCore extends ObjectModel
return true; return true;
} }
public static function getTotalCart($id_cart, $use_tax_display = false) public static function getTotalCart($id_cart, $use_tax_display = false, $type = CART::BOTH)
{ {
$cart = new Cart($id_cart); $cart = new Cart($id_cart);
if (!Validate::isLoadedObject($cart)) if (!Validate::isLoadedObject($cart))
die(Tools::displayError()); die(Tools::displayError());
$with_taxes = $use_tax_display ? $cart->_taxCalculationMethod != PS_TAX_EXC : true; $with_taxes = $use_tax_display ? $cart->_taxCalculationMethod != PS_TAX_EXC : true;
return Tools::displayPrice($cart->getOrderTotal($with_taxes), Currency::getCurrencyInstance((int)$cart->id_currency), false); return Tools::displayPrice($cart->getOrderTotal($with_taxes, $type), Currency::getCurrencyInstance((int)$cart->id_currency), false);
} }
controllers/admin/AdminCartsController.php
+2 -2
View File
@@ -721,8 +721,8 @@ class AdminCartsControllerCore extends AdminController
{ {
$context = Context::getContext(); $context = Context::getContext();
$context->cart = new Cart($id_cart); $context->cart = new Cart($id_cart);
$context->customer = new Customer($context->cart->id_customer); $context->customer = new Customer((int)$context->cart->id_customer);
return Cart::getTotalCart($id_cart, true); return Cart::getTotalCart($id_cart, true, Cart::BOTH_WITHOUT_SHIPPING);
} }
public static function replaceZeroByShopName($echo, $tr) public static function replaceZeroByShopName($echo, $tr)