diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index a2737cd01..aa9043ef0 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -48,6 +48,10 @@ class AdminAddressesControllerCore extends AdminController if (!Tools::getValue('realedit')) $this->deleted = true; + $countries = Country::getCountries($this->context->language->id); + foreach ($countries as $country) + $this->countries_array[$country['id_country']] = $country['name']; + $this->fieldsDisplay = array( 'id_address' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), 'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'), @@ -67,10 +71,6 @@ class AdminAddressesControllerCore extends AdminController LEFT JOIN `'._DB_PREFIX_.'country_lang` cl ON (cl.`id_country` = a.`id_country` AND cl.`id_lang` = '.(int)$this->context->language->id.')'; $this->_where = 'AND a.id_customer != 0'; - $countries = Country::getCountries($this->context->language->id); - foreach ($countries as $country) - $this->countries_array[$country['id_country']] = $country['name']; - return parent::renderList(); } diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php index ad7890b7d..975e07f80 100644 --- a/controllers/admin/AdminAttributesGroupsController.php +++ b/controllers/admin/AdminAttributesGroupsController.php @@ -51,12 +51,12 @@ class AdminAttributesGroupsControllerCore extends AdminController 'count_values' => array( 'title' => $this->l('Values count'), 'width' => 120, - 'align' => 'center' + 'align' => 'center', ), 'position' => array( 'title' => $this->l('Position'), 'width' => 40, - 'filter_key' => 'cp!position', + 'filter_key' => 'a!position', 'position' => 'position', 'align' => 'center' ), diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 0a81a374e..5e5ade8b2 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -95,7 +95,7 @@ class AdminCarriersControllerCore extends AdminController 'position' => array( 'title' => $this->l('Position'), 'width' => 40, - 'filter_key' => 'cp!position', + 'filter_key' => 'a!position', 'align' => 'center', 'position' => 'position' ) diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index d42045792..479958daf 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -66,7 +66,7 @@ class AdminCategoriesControllerCore extends AdminController 'position' => array( 'title' => $this->l('Position'), 'width' => 40, - 'filter_key' => 'position', + 'filter_key' => 'cs!position', 'align' => 'center', 'position' => 'position' ), diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 0f4a14604..ed502512f 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -130,7 +130,8 @@ class AdminCustomersControllerCore extends AdminController 'title' => $this->l('Connection'), 'width' => 100, 'type' => 'datetime', - 'search' => false + 'search' => false, + 'havingFilter' => true ) ); diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index 9e6891c3e..83471bda7 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -51,7 +51,7 @@ class AdminFeaturesControllerCore extends AdminController 'position' => array( 'title' => $this->l('Position'), 'width' => 40, - 'filter_key' => 'cp!position', + 'filter_key' => 'a!position', 'align' => 'center', 'position' => 'position' ) diff --git a/controllers/admin/AdminGroupShopController.php b/controllers/admin/AdminGroupShopController.php index 26364a844..6c389c894 100644 --- a/controllers/admin/AdminGroupShopController.php +++ b/controllers/admin/AdminGroupShopController.php @@ -53,7 +53,7 @@ class AdminGroupShopControllerCore extends AdminController 'name' => array( 'title' => $this->l('Group shop'), 'width' => 'auto', - 'filter_key' => 'b!name', + 'filter_key' => 'a!name', ), 'active' => array( 'title' => $this->l('Enabled'), diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 3f2f68504..4a58096db 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -67,13 +67,13 @@ class AdminManufacturersControllerCore extends AdminController ), 'addresses' => array( 'title' => $this->l('Addresses'), - 'tmpTableFilter' => true, 'width' => 20, 'align' => 'center', + 'havingFilter' => true ), 'products' => array( 'title' => $this->l('Products'), - 'tmpTableFilter' => true, + 'havingFilter' => true, 'width' => 20, 'align' => 'center', ), diff --git a/controllers/admin/AdminOutstandingController.php b/controllers/admin/AdminOutstandingController.php index cdd9502f5..2c9e2e7b5 100644 --- a/controllers/admin/AdminOutstandingController.php +++ b/controllers/admin/AdminOutstandingController.php @@ -60,7 +60,8 @@ class AdminOutstandingControllerCore extends AdminController 'title' => $this->l('Date'), 'width' => 150, 'type' => 'date', - 'align' => 'right' + 'align' => 'right', + 'filter_key' => 'a!date_add' ), 'customer' => array( 'title' => $this->l('Customer'), diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index aae92bcb6..0c0490968 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -43,15 +43,17 @@ class AdminShopControllerCore extends AdminController 'name' => array( 'title' => $this->l('Shop'), 'width' => 'auto', - 'filter_key' => 'b!name' + 'filter_key' => 'a!name' ), 'group_shop_name' => array( 'title' => $this->l('Group Shop'), - 'width' => 150 + 'width' => 150, + 'filter_key' => 'gs!name' ), 'category_name' => array( 'title' => $this->l('Category Root'), - 'width' => 150 + 'width' => 150, + 'filter_key' => 'cl!name' ), 'active' => array( 'title' => $this->l('Enabled'), diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php index 759f21b63..610e611cd 100644 --- a/controllers/admin/AdminShopUrlController.php +++ b/controllers/admin/AdminShopUrlController.php @@ -47,7 +47,8 @@ class AdminShopUrlControllerCore extends AdminController ), 'shop_name' => array( 'title' => $this->l('Shop name'), - 'width' => 150 + 'width' => 150, + 'filter_key' => 's!name' ), 'domain' => array( 'title' => $this->l('Domain'), @@ -62,7 +63,8 @@ class AdminShopUrlControllerCore extends AdminController 'uri' => array( 'title' => $this->l('Uri'), 'width' => 200, - 'filter_key' => 'uri' + 'filter_key' => 'uri', + 'havingFilter' => true ), 'main' => array( 'title' => $this->l('Main URL'), diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php index 9575bff17..fdcb65d03 100755 --- a/controllers/admin/AdminSpecificPriceRuleController.php +++ b/controllers/admin/AdminSpecificPriceRuleController.php @@ -61,22 +61,27 @@ class AdminSpecificPriceRuleControllerCore extends AdminController ), 'name' => array( 'title' => $this->l('Name'), + 'filter_key' => 'a!name', 'width' => 200 ), 'shop_name' => array( - 'title' => $this->l('Shop') + 'title' => $this->l('Shop'), + 'filter_key' => 's!name' ), 'currency_name' => array( 'title' => $this->l('Currency'), 'align' => 'center', + 'filter_key' => 'cu!name' ), 'country_name' => array( 'title' => $this->l('Country'), 'align' => 'center', + 'filter_key' => 'cl!name' ), 'group_name' => array( 'title' => $this->l('Group'), 'align' => 'center', + 'filter_key' => 'gl!name' ), 'from_quantity' => array( 'title' => $this->l('From quantity'), @@ -97,6 +102,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController 'from' => array( 'title' => $this->l('From'), 'align' => 'center', + 'type' => 'date' ), 'to' => array( 'title' => $this->l('To'),