From dbd2ab3db63621fa47cc21c3e7b0ffb5e62d1630 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 8 Oct 2020 13:18:04 +0300 Subject: [PATCH 1/2] =?UTF-8?q?#1767=20[users]=20Admin=20listelemede=20m?= =?UTF-8?q?=C3=BC=C5=9Fteri=20ad=C4=B1=20yazm=C4=B1yor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../defaultadmin-theme/src/Listener/AddGsmFilter.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php index ffbb8ca40..4a28db2fb 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,7 +70,11 @@ class AddGsmFilter ]); $collection = new Collection(); - $header_email = new Header(); + $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(); $header_gsm_phone = $header_phone->setBuilder($builder)->setHeading('visiosoft.module.profile::field.gsm_phone.name'); @@ -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); From 3b226fc6d4ff328ab9b97c654692353cb13a6f87 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 26 Oct 2020 15:03:11 +0300 Subject: [PATCH 2/2] #2469 oc product options error fixed --- ...visiosoft.module.advs__create_option_configuration_stream.php | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php index 456ec6a8c..b42c31acf 100644 --- a/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php @@ -52,7 +52,6 @@ class VisiosoftModuleAdvsCreateOptionConfigurationStream extends Migration ], 'option_json' => [ 'required' => true, - 'unique' => true, ], ];