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

// small bug fix on BO orders

Browse Source
This commit is contained in:
dMetzger
2012-08-14 09:15:50 +00:00
parent 06aa7e859c
commit a1d1158af1
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+7 -7
View File
@@ -2991,14 +2991,14 @@ class CartCore extends ObjectModel
return $result; return $result;
} }
public static function getCustomerCarts($id_customer) public static function getCustomerCarts($id_customer, $with_order = true)
{ {
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT * SELECT *
FROM '._DB_PREFIX_.'cart c FROM '._DB_PREFIX_.'cart c
WHERE c.`id_customer` = '.(int)$id_customer.' WHERE c.`id_customer` = '.(int)$id_customer.'
ORDER BY c.`date_add` DESC'); '.(!$with_order ? 'AND id_cart NOT IN (SELECT id_cart FROM '._DB_PREFIX_.'orders o WHERE o.`id_customer` = '.(int)$id_customer.')' : '').'
return $result; ORDER BY c.`date_add` DESC');
} }
public static function replaceZeroByShopName($echo, $tr) public static function replaceZeroByShopName($echo, $tr)
classes/Customer.php
+2 -2
View File
@@ -737,9 +737,9 @@ class CustomerCore extends ObjectModel
$this->logged = 0; $this->logged = 0;
} }
public function getLastCart() public function getLastCart($with_order = true)
{ {
$carts = Cart::getCustomerCarts((int)$this->id); $carts = Cart::getCustomerCarts((int)$this->id, $with_order);
if (!count($carts)) if (!count($carts))
return false; return false;
$cart = array_shift($carts); $cart = array_shift($carts);
controllers/admin/AdminCartsController.php
+1 -1
View File
@@ -188,7 +188,7 @@ class AdminCartsControllerCore extends AdminController
$this->context->customer = $customer; $this->context->customer = $customer;
$id_cart = (int)Tools::getValue('id_cart'); $id_cart = (int)Tools::getValue('id_cart');
if (!$id_cart) if (!$id_cart)
$id_cart = $customer->getLastCart(); $id_cart = $customer->getLastCart(false);
$this->context->cart = new Cart((int)$id_cart); $this->context->cart = new Cart((int)$id_cart);
if (!$this->context->cart->id_customer) if (!$this->context->cart->id_customer)
$this->context->cart->id_customer = $id_customer; $this->context->cart->id_customer = $id_customer;