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

// Merge -> revision 9288

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-12 16:04:28 +00:00
parent 17aa43a4e5
commit 798de9aaea
32 changed files with 1529 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Order.php
+3 -3
View File
@@ -377,7 +377,7 @@ class OrderCore extends ObjectModel
if (!$id_order_state)
$id_order_state = 0;
if (!isset(self::$_historyCache[$id_order_state]) OR $no_hidden)
if (!isset(self::$_historyCache[$this->id.'_'.$id_order_state]) OR $no_hidden)
{
$id_lang = $id_lang ? (int)($id_lang) : 'o.`id_lang`';
$result = Db::getInstance()->executeS('
@@ -393,9 +393,9 @@ class OrderCore extends ObjectModel
ORDER BY oh.date_add DESC, oh.id_order_history DESC');
if ($no_hidden)
return $result;
self::$_historyCache[$id_order_state] = $result;
self::$_historyCache[$this->id.'_'.$id_order_state] = $result;
}
return self::$_historyCache[$id_order_state];
return self::$_historyCache[$this->id.'_'.$id_order_state];
}
public function getProductsDetail()