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

[-] BO : Fix bug, orders states not ordered by order state name

Browse Source
This commit is contained in:
gRoussac committed 2013-09-12 15:09:21 +02:00
1 parent 30591b7c28
commit 5095b45e47
2 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/controller/AdminController.php
+5 -2
View File
@@ -2159,8 +2159,11 @@ class AdminControllerCore extends Controller
|| !Validate::isUnsignedId($id_lang)) || !Validate::isUnsignedId($id_lang))
throw new PrestaShopException('get list params is not valid'); throw new PrestaShopException('get list params is not valid');
if (isset($this->fields_list[$order_by]) && isset($this->fields_list[$order_by]['filter_key'])) if (!isset($this->fields_list[$order_by]['order_key']) && isset($this->fields_list[$order_by]['filter_key']))
$order_by = $this->fields_list[$order_by]['filter_key']; $this->fields_list[$order_by]['order_key'] = $this->fields_list[$order_by]['filter_key'];
if (isset($this->fields_list[$order_by]) && isset($this->fields_list[$order_by]['order_key']))
$order_by = $this->fields_list[$order_by]['order_key'];
/* Determine offset from current page */ /* Determine offset from current page */
if ((isset($_POST['submitFilter'.$this->list_id]) || if ((isset($_POST['submitFilter'.$this->list_id]) ||
controllers/admin/AdminOrdersController.php
+2 -1
View File
@@ -110,7 +110,8 @@ class AdminOrdersControllerCore extends AdminController
'type' => 'select', 'type' => 'select',
'list' => $statuses_array, 'list' => $statuses_array,
'filter_key' => 'os!id_order_state', 'filter_key' => 'os!id_order_state',
'filter_type' => 'int' 'filter_type' => 'int',
'order_key' => 'osname'
), ),
'date_add' => array( 'date_add' => array(
'title' => $this->l('Date'), 'title' => $this->l('Date'),