From 5095b45e47dd0785a00d216624879b02f42a5fe4 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 12 Sep 2013 15:09:21 +0200 Subject: [PATCH] [-] BO : Fix bug, orders states not ordered by order state name --- classes/controller/AdminController.php | 7 +++++-- controllers/admin/AdminOrdersController.php | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 82465abf0..94bc96d7d 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2159,8 +2159,11 @@ class AdminControllerCore extends Controller || !Validate::isUnsignedId($id_lang)) throw new PrestaShopException('get list params is not valid'); - if (isset($this->fields_list[$order_by]) && isset($this->fields_list[$order_by]['filter_key'])) - $order_by = $this->fields_list[$order_by]['filter_key']; + if (!isset($this->fields_list[$order_by]['order_key']) && isset($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 */ if ((isset($_POST['submitFilter'.$this->list_id]) || diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 3ca37b935..23bd95520 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -110,7 +110,8 @@ class AdminOrdersControllerCore extends AdminController 'type' => 'select', 'list' => $statuses_array, 'filter_key' => 'os!id_order_state', - 'filter_type' => 'int' + 'filter_type' => 'int', + 'order_key' => 'osname' ), 'date_add' => array( 'title' => $this->l('Date'),