Issue #208 fixed

Author: jitendra-webkul

packages/Webkul/Admin/src/Config/datagrid_filters.php

@@ -27,7 +27,7 @@
             ]
         ], [
             'type'      => 'group',
-            'key'       => 'duration',
+            'key'       => 'scheduled',
             'condition' => 'eq',
             'values'    => [
                 [
@@ -68,6 +68,4 @@
             "repositoryClass"   => "\Webkul\Lead\Repositories\StageRepository",
         ]
     ]
-];
-
-?>
+];

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

@@ -9,7 +9,9 @@
 class ActivityDataGrid extends DataGrid
 {
     protected $users = [];
+
     protected $persons = [];
+
     protected $tabFilters = [];
 
     protected $redirectRow = [
@@ -108,10 +110,10 @@ public function addColumns()
         ]);
 
         $this->addColumn([
-            'index'         => 'type',
-            'head_style'    => 'width: 70px',
-            'label'         => trans('admin::app.datagrid.type'),
-            'type'          => 'boolean',
+            'index'      => 'type',
+            'head_style' => 'width: 70px',
+            'label'      => trans('admin::app.datagrid.type'),
+            'type'       => 'boolean',
         ]);
 
         $this->addColumn([

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

@@ -120,6 +120,7 @@ public function sortOrFilterCollection($collection, $parseInfo)
 
                 case 'type':
                 case 'duration':
+                case 'scheduled':
                     $collection = $this->prepareTabFilter($collection, $key, $info);
                     break;
 

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

@@ -179,7 +179,14 @@ public function prepareTabFilter($collection, $key, $info)
                 }
 
                 $value = array_values($info)[0];
-                $column = ($key === "duration") ? $this->filterMap["created_at"] ?? "created_at" : $key;
+
+                if ($key === "duration") {
+                    $column = $this->filterMap["created_at"] ?? "created_at";
+                } else if ($key === "scheduled") {
+                    $column = "schedule_from";
+                } else {
+                    $column = $key;
+                }
 
                 $endDate = Carbon::now()->format('Y-m-d');
 

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

@@ -140,7 +140,7 @@ public function prepareTabFilters($key)
                 }
             }
         }
-
+        
         return $tabFilters;
     }
 }