misc. filters added

Author: shubh-mehrotra

packages/Webkul/Admin/src/DataGrids/Activity/ActivityDataGrid.php

@@ -82,18 +82,6 @@ public function __construct()
             ],
         ];
 
-        // persons list to filter table data
-        $personRepository = app('\Webkul\Contact\Repositories\PersonRepository');
-
-        $persons = $personRepository->all();
-
-        foreach ($persons as $person) {
-            array_push($this->persons, [
-                'value' => $person['id'],
-                'label' => $person['name'],
-            ]);
-        }
-
         parent::__construct();
     }
 
@@ -120,7 +108,7 @@ public function prepareQueryBuilder()
 
         $this->addFilter('id', 'lead_activities.id');
         $this->addFilter('assigned_to', 'users.name');
-        $this->addFilter('contact_person', 'persons.id');
+        $this->addFilter('contact_person', 'persons.name');
         $this->addFilter('user', 'lead_activities.user_id');
         $this->addFilter('created_at', 'lead_activities.created_at');
 
@@ -191,8 +179,7 @@ public function addColumns()
             'index'              => 'contact_person',
             'label'              => trans('admin::app.datagrid.contact_person'),
             'type'               => 'string',
-            'filterable_type'    => 'dropdown',
-            'filterable_options' => $this->persons,
+            'filterable_type'    => 'add',
             'closure'            => function ($row) {
                 $route = urldecode(route('admin.contacts.persons.index', ['id[eq]' => $row->contact_person_id]));
 

packages/Webkul/Admin/src/DataGrids/Contact/PersonDataGrid.php

@@ -52,12 +52,13 @@ public function addColumns()
         ]);
 
         $this->addColumn([
-            'index'      => 'emails',
-            'label'      => trans('admin::app.datagrid.emails'),
-            'type'       => 'string',
-            'searchable' => true,
-            'sortable'   => false,
-            'closure'    => function ($row) {
+            'index'             => 'emails',
+            'label'             => trans('admin::app.datagrid.emails'),
+            'type'              => 'string',
+            'searchable'        => true,
+            'sortable'          => false,
+            'filterable_type'   => 'add',
+            'closure'           => function ($row) {
                 $emails = json_decode($row->emails, true);
 
                 if ($emails) {
@@ -69,12 +70,13 @@ public function addColumns()
         ]);
 
         $this->addColumn([
-            'index'      => 'contact_numbers',
-            'label'      => trans('admin::app.datagrid.contact_numbers'),
-            'type'       => 'string',
-            'searchable' => true,
-            'sortable'   => false,
-            'closure'    => function ($row) {
+            'index'             => 'contact_numbers',
+            'label'             => trans('admin::app.datagrid.contact_numbers'),
+            'type'              => 'string',
+            'searchable'        => true,
+            'sortable'          => false,
+            'filterable_type'   => 'add',
+            'closure'           => function ($row) {
                 $contactNumbers = json_decode($row->contact_numbers, true);
 
                 if ($contactNumbers) {

packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php

@@ -107,12 +107,13 @@ public function addColumns()
         ]);
 
         $this->addColumn([
-            'index'      => 'lead_value',
-            'label'      => trans('admin::app.datagrid.lead_value'),
-            'type'       => 'string',
-            'searchable' => true,
-            'sortable'   => true,
-            'closure'    => function ($row) {
+            'index'           => 'lead_value',
+            'label'           => trans('admin::app.datagrid.lead_value'),
+            'type'            => 'string',
+            'searchable'      => true,
+            'sortable'        => true,
+            'filterable_type' => 'add',
+            'closure'         => function ($row) {
                 return round($row->lead_value, 2);
             },
         ]);

packages/Webkul/Admin/src/DataGrids/Product/ProductDataGrid.php

@@ -47,12 +47,13 @@ public function addColumns()
         ]);
 
         $this->addColumn([
-            'index'      => 'price',
-            'label'      => trans('admin::app.datagrid.price'),
-            'type'       => 'string',
-            'searchable' => true,
-            'sortable'   => true,
-            'closure'    => function ($row) {
+            'index'           => 'price',
+            'label'           => trans('admin::app.datagrid.price'),
+            'type'            => 'string',
+            'searchable'      => true,
+            'sortable'        => true,
+            'filterable_type' => 'add',
+            'closure'         => function ($row) {
                 return round($row->price, 2);
             },
         ]);

packages/Webkul/UI/publishable/assets/css/ui.css

@@ -1,6 +1,6 @@
 {
     "/js/ui.js": "/js/ui.js?id=925202de58f991c86c6c",
-    "/css/ui.css": "/css/ui.css?id=e257645d1bdbfb58f53b",
+    "/css/ui.css": "/css/ui.css?id=b82e866167fb8ee7c926",
     "/images/add-icon.svg": "/images/add-icon.svg?id=9135b4e0e1c239c36981",
     "/images/align-justify-icon.svg": "/images/align-justify-icon.svg?id=ee8d48e636b80417a884",
     "/images/arrow-down-icon.svg": "/images/arrow-down-icon.svg?id=7b5c03f96be72c9a0bef",

packages/Webkul/UI/publishable/assets/mix-manifest.json

@@ -71,10 +71,13 @@ private function filterCollection($collection, $info, $columnName, $type = "filt
             foreach ($info as $condition => $filter_value) {
                 switch ($condition) {
                     case 'in':
-                        $collection->whereIn(
-                            $columnName,
-                            explode(',', $filter_value)
-                        );
+                        foreach (explode(',', $filter_value) as $value) {
+                            $collection->orWhere(
+                                $columnName,
+                                'like',
+                                "%$value%"
+                            );
+                        }
                         break;
 
                     case 'bw':

packages/Webkul/UI/src/DataGrid/Traits/DatagridCollection.php

@@ -405,6 +405,7 @@ h5 {
                 border-right: 0px;
                 color: $dark-color;
                 cursor: not-allowed;
+                text-transform: capitalize;
                 font-weight: $font-weight-medium;
                 border-bottom: 1px solid rgba(193,194,195,.5);