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

// Context part 3

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7603 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-12 16:25:27 +00:00
parent 50f9794383
commit 9f7c369d53
16 changed files with 127 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/OrderReturn.php
+4 -4
View File
@@ -132,10 +132,10 @@ class OrderReturnCore extends ObjectModel
return (int)($data['total']);
}
static public function getOrdersReturn($customer_id, $order_id = false, $no_denied = false)
static public function getOrdersReturn($customer_id, $order_id = false, $no_denied = false, $context = null)
{
global $cookie;
if (!$context)
$context = Context::getContext();
$data = Db::getInstance()->ExecuteS('
SELECT *
FROM `'._DB_PREFIX_.'order_return`
@@ -146,7 +146,7 @@ class OrderReturnCore extends ObjectModel
foreach ($data AS $k => $or)
{
$state = new OrderReturnState($or['state']);
$data[$k]['state_name'] = $state->name[$cookie->id_lang];
$data[$k]['state_name'] = $state->name[$context->language->id];
}
return $data;
}