From b6f1fed10dd6fbc407648e07687306cf57226aab Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 29 Dec 2020 19:53:54 +0530
Subject: [PATCH 1/2] Translation Added

---
 .../Webkul/Admin/src/DataGrids/SliderDataGrid.php   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
index 6e47b373e..48dcaf25f 100755
--- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
@@ -32,11 +32,13 @@ class SliderDataGrid extends DataGrid
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('sliders as sl')
-          ->addSelect('sl.id as slider_id', 'sl.title', 'sl.locale', 'ch.name', 'ch.code')
-          ->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id');
+          ->select('sl.id as slider_id', 'sl.title', 'sl.locale', 'ct.name', 'ch.code')
+          ->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id')
+          ->leftJoin('channel_translations as ct', 'ch.id', '=', 'ct.channel_id')
+          ->distinct();
 
         if ($this->locale !== 'all') {
-            $queryBuilder->where('locale', $this->locale);
+            $queryBuilder->where('sl.locale', $this->locale);
         }
 
         if ($this->channel !== 'all') {
@@ -44,7 +46,10 @@ class SliderDataGrid extends DataGrid
         }
 
         $this->addFilter('slider_id', 'sl.id');
-        $this->addFilter('channel_name', 'ch.name');
+        $this->addFilter('title', 'sl.title');
+        $this->addFilter('locale', 'sl.locale');
+        $this->addFilter('channel_name', 'ct.name');
+        $this->addFilter('code', 'ch.code');
 
         $this->setQueryBuilder($queryBuilder);
     }

From 1e55a5c6b25c7b8c16bdb4a4e67184353a91875b Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 30 Dec 2020 16:35:41 +0530
Subject: [PATCH 2/2] Query Fixed

---
 .../Admin/src/DataGrids/SliderDataGrid.php    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
index 48dcaf25f..b206ca1c1 100755
--- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
@@ -2,12 +2,13 @@
 
 namespace Webkul\Admin\DataGrids;
 
-use Illuminate\Support\Facades\DB;
+use Webkul\Core\Models\Channel;
 use Webkul\Ui\DataGrid\DataGrid;
+use Illuminate\Support\Facades\DB;
 
 class SliderDataGrid extends DataGrid
 {
-    protected $index = 'slider_id';
+    protected $index = 'id';
 
     protected $sortOrder = 'desc';
 
@@ -15,7 +16,11 @@ class SliderDataGrid extends DataGrid
 
     protected $channel = 'all';
 
-    /** @var string[] contains the keys for which extra filters to render */
+    /**
+     * Contains the keys for which extra filters to render.
+     *
+     * @var string[]
+     **/
     protected $extraFilters = [
         'channels',
         'locales',
@@ -26,16 +31,18 @@ class SliderDataGrid extends DataGrid
         parent::__construct();
 
         $this->locale = request()->get('locale') ?? 'all';
-        $this->channel = request()->get('channel') ?? 'all';
+        $this->channel = request()->get('channel')
+            ? Channel::find(request()->get('channel'))->code
+            : 'all';
     }
 
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('sliders as sl')
-          ->select('sl.id as slider_id', 'sl.title', 'sl.locale', 'ct.name', 'ch.code')
+          ->select('sl.id', 'sl.title', 'sl.locale', 'ct.channel_id', 'ct.name', 'ch.code')
           ->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id')
           ->leftJoin('channel_translations as ct', 'ch.id', '=', 'ct.channel_id')
-          ->distinct();
+          ->where('ct.locale', app()->getLocale());
 
         if ($this->locale !== 'all') {
             $queryBuilder->where('sl.locale', $this->locale);
@@ -45,7 +52,7 @@ class SliderDataGrid extends DataGrid
             $queryBuilder->where('ch.code', $this->channel);
         }
 
-        $this->addFilter('slider_id', 'sl.id');
+        $this->addFilter('id', 'sl.id');
         $this->addFilter('title', 'sl.title');
         $this->addFilter('locale', 'sl.locale');
         $this->addFilter('channel_name', 'ct.name');
@@ -57,7 +64,7 @@ class SliderDataGrid extends DataGrid
     public function addColumns()
     {
         $this->addColumn([
-            'index'      => 'slider_id',
+            'index'      => 'id',
             'label'      => trans('admin::app.datagrid.id'),
             'type'       => 'number',
             'searchable' => false,