From 436557fe81147df23906c1de1d2e5206e6520173 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Thu, 10 Jan 2019 18:54:35 +0530
Subject: [PATCH] minor changes in datagrid frontend templates

---
 .../Admin/src/DataGrids/UserDataGrid.php      | 12 +---------
 .../Resources/views/testgrid/body.blade.php   | 24 ++++++++++++-------
 .../Resources/views/testgrid/table.blade.php  | 10 ++++----
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
index 4b6303eaf..ff29b2554 100755
--- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
@@ -52,7 +52,7 @@ class UserDataGrid extends AbsGrid
             'index' => 'u.status',
             'alias' => 'adminStatus',
             'label' => 'Status',
-            'type' => 'string',
+            'type' => 'boolean',
             'searchable' => true,
             'sortable' => true,
             'width' => '100px',
@@ -74,16 +74,6 @@ class UserDataGrid extends AbsGrid
             'sortable' => true,
             'width' => '100px'
         ]);
-
-        $this->addColumn([
-            'index' => 'ro.name',
-            'alias' => 'rolename',
-            'label' => 'Role',
-            'type' => 'string',
-            'searchable' => true,
-            'sortable' => true,
-            'width' => '100px'
-        ]);
     }
 
     public function prepareActions() {
diff --git a/packages/Webkul/Ui/src/Resources/views/testgrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/testgrid/body.blade.php
index 8f8d529d0..8883e7850 100644
--- a/packages/Webkul/Ui/src/Resources/views/testgrid/body.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/testgrid/body.blade.php
@@ -1,7 +1,5 @@
 <tbody>
     @foreach($records as $key => $record)
-        {{-- {{ dd($record) }} --}}
-
         <tr>
             <td>
                 <span class="checkbox">
@@ -10,14 +8,24 @@
                     <label class="checkbox-view" for="checkbox1"></label>
                 </span>
             </td>
-
-            @foreach($record as $column)
-                @if(isset($columns[$key]))
-                    @if(isset($columns[$key]['wrapper']))
-
+            <?php $i = 0; ?>
+            @foreach($record as $key1 => $column)
+                @if($columns[$i]['type'] == 'boolean' && $columns[$i]['label'] == 'Status')
+                    @if($column == 0)
+                        <td>Inactive</td>
+                    @else
+                        <td>Active</td>
                     @endif
+                @elseif($columns[$i]['type'] == 'boolean' && $columns[$i]['label'] != 'Status')
+                    @if($column == 0)
+                        <td>False</td>
+                    @else
+                        <td>True</td>
+                    @endif
+                @else
+                    <td>{{ $column }}</td>
                 @endif
-                <td>{{ $column }}</td>
+                <?php $i++; ?>
             @endforeach
 
             <td style="width: 50px;">
diff --git a/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php
index d30cc4dcb..c33c4900d 100644
--- a/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/testgrid/table.blade.php
@@ -355,11 +355,11 @@
                             if(this.filters[i].column == 'sort') {
                                 this.currentSort = this.filters[i].val;
 
-                                if(this.currentSort = 'asc') {
-                                    this.currentSortIcon = this.sortUpIcon;
-                                } else {
-                                    this.currentSortIcon = this.sortDownIcon;
-                                }
+                                // if(this.currentSort = 'asc') {
+                                //     this.currentSortIcon = this.sortUpIcon;
+                                // } else {
+                                //     this.currentSortIcon = this.sortDownIcon;
+                                // }
                             }
                         }
                     },