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

// Merge -> revision 9288

Browse Source
This commit is contained in:
rMalie
2011-10-12 16:04:28 +00:00
parent a6f2eb5639
commit a07c14fafd
32 changed files with 1529 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FrontController.php
+7 -6
View File
@@ -618,13 +618,14 @@ class FrontControllerCore extends Controller
$stop = (int)($pages_nb);
$this->context->smarty->assign('nb_products', $nbProducts);
$pagination_infos = array(
'pages_nb' => (int)($pages_nb),
'p' => (int)($this->p),
'n' => (int)($this->n),
'products_per_page' => (int)Configuration::get('PS_PRODUCTS_PER_PAGE'),
'pages_nb' => $pages_nb,
'p' => $this->p,
'n' => $this->n,
'nArray' => $nArray,
'range' => (int)($range),
'start' => (int)($start),
'stop' => (int)($stop),
'range' => $range,
'start' => $start,
'stop' => $stop,
'current_url' => $current_url
);
$this->context->smarty->assign($pagination_infos);
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()