diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 0991832e0..d0e4b35e3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -40,8 +40,7 @@ 'villages':villages, 'param':param, 'categoryId':categoryId, - 'cityId':cityId, - '_ORDER_':['visiosoft.module.cats', 'visiosoft.module.location'] + 'cityId':cityId })|raw }} diff --git a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php index ffbb8ca40..bbec40070 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php @@ -51,6 +51,8 @@ class AddGsmFilter $builder->getTable()->addFilter($filter); $builder->setColumns([ + 'first_name', + 'last_name', 'email', 'gsm_phone', 'created_at' => [ @@ -68,6 +70,10 @@ class AddGsmFilter ]); $collection = new Collection(); + $header_firstname = new Header(); + $header_firstname = $header_firstname->setBuilder($builder)->setHeading('anomaly.module.users::field.first_name.name'); + $header_lastname = new Header(); + $header_lastname = $header_lastname->setBuilder($builder)->setHeading('anomaly.module.users::field.last_name.name'); $header_email = new Header(); $header_email = $header_email->setBuilder($builder)->setHeading('anomaly.module.users::field.email.name')->setSortable(true)->setSortColumn('email'); $header_phone = new Header(); @@ -77,6 +83,8 @@ class AddGsmFilter $header_status = new Header(); $header_status = $header_status->setBuilder($builder)->setHeading('anomaly.module.users::field.status.name'); + $collection = $collection->add($header_firstname); + $collection = $collection->add($header_lastname); $collection = $collection->add($header_email); $collection = $collection->add($header_gsm_phone); $collection = $collection->add($header_created_at);