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

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/OrderReturn.php
+7 -7
View File
@@ -100,7 +100,7 @@ class OrderReturnCore extends ObjectModel
}
/* Quantity check */
if ($orderDetailList)
foreach ($orderDetailList AS $key => $orderDetail)
foreach (array_keys($orderDetailList) AS $key)
if ($qty = (int)($productQtyList[$key]))
if ($products[$key]['product_quantity'] - $qty < 0)
return false;
@@ -108,7 +108,7 @@ class OrderReturnCore extends ObjectModel
if ($customizationIds)
{
$orderedCustomizations = Customization::getOrderedCustomizations((int)($order->id_cart));
foreach ($customizationIds AS $productId => $customizations)
foreach ($customizationIds AS $customizations)
foreach ($customizations AS $customizationId)
{
$customizationId = (int)($customizationId);
@@ -131,7 +131,7 @@ class OrderReturnCore extends ObjectModel
return false;
return (int)($data['total']);
}
static public function getOrdersReturn($customer_id, $order_id = false, $no_denied = false, Context $context = null)
{
if (!$context)
@@ -151,7 +151,7 @@ class OrderReturnCore extends ObjectModel
return $data;
}
static public function getOrdersReturnDetail($id_order_return)
public static function getOrdersReturnDetail($id_order_return)
{
return Db::getInstance()->ExecuteS('
SELECT *
@@ -159,7 +159,7 @@ class OrderReturnCore extends ObjectModel
WHERE `id_order_return` = '.(int)($id_order_return));
}
static public function getOrdersReturnProducts($orderReturnId, $order)
public static function getOrdersReturnProducts($orderReturnId, $order)
{
$productsRet = self::getOrdersReturnDetail($orderReturnId);
$products = $order->getProducts();
@@ -180,7 +180,7 @@ class OrderReturnCore extends ObjectModel
return $resTab;
}
static public function getReturnedCustomizedProducts($id_order)
public static function getReturnedCustomizedProducts($id_order)
{
$returns = Customization::getReturnedCustomizations($id_order);
$order = new Order((int)($id_order));
@@ -197,7 +197,7 @@ class OrderReturnCore extends ObjectModel
return $returns;
}
static public function deleteOrderReturnDetail($id_order_return, $id_order_detail, $id_customization = 0)
public static function deleteOrderReturnDetail($id_order_return, $id_order_detail, $id_customization = 0)
{
return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'order_return_detail` WHERE `id_order_detail` = '.(int)($id_order_detail).' AND `id_order_return` = '.(int)($id_order_return).' AND `id_customization` = '.(int)($id_customization));
}