From 489dcf0b54adc795885d174105ba01cde7dc6f9c Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Tue, 18 Dec 2018 16:14:21 +0530
Subject: [PATCH] Bugs and issues resolvements

---
 .../Admin/src/DataGrids/UserDataGrid.php      | 28 +++++++++++++++----
 .../views/layouts/nav-aside.blade.php         |  6 ----
 .../Resources/views/layouts/tabs.blade.php    |  9 ------
 .../views/users/users/create.blade.php        |  2 +-
 .../views/users/users/edit.blade.php          |  1 +
 .../Http/Controllers/CustomerController.php   |  2 +-
 packages/Webkul/Ui/webpack.mix.js             |  2 +-
 .../Http/Controllers/SessionController.php    | 11 +++++++-
 .../User/src/Http/Requests/UserForm.php       |  3 +-
 9 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
index b9f6ccd93..465815192 100644
--- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
@@ -92,6 +92,18 @@ class UserDataGrid
                     // 'wrapper' => function ($value, $object) {
                     //     return '<a class="color-red">' . $object->Name . '</a>';
                     // },
+                ], [
+                    'name' => 'u.status',
+                    'alias' => 'Status',
+                    'type' => 'boolean',
+                    'label' => 'Status',
+                    'sortable' => true,
+                    'wrapper' => function ($value) {
+                        if($value == 1)
+                            return "Active";
+                        else
+                            return "Inactive";
+                    },
                 ], [
                     'name' => 'u.email',
                     'alias' => 'Email',
@@ -106,6 +118,7 @@ class UserDataGrid
                     'sortable' => true,
                 ],
             ],
+
             //don't use aliasing in case of filters
             'filterable' => [
                 [
@@ -122,14 +135,20 @@ class UserDataGrid
                     'column' => 'u.email',
                     'alias' => 'Email',
                     'type' => 'string',
-                    'label' => 'Email',
+                    'label' => 'Email'
                 ], [
                     'column' => 'r.name',
                     'alias' => 'rolename',
                     'type' => 'string',
-                    'label' => 'Role Name',
+                    'label' => 'Role Name'
+                ], [
+                    'name' => 'u.status',
+                    'alias' => 'Status',
+                    'type' => 'boolean',
+                    'label' => 'Status'
                 ]
             ],
+
             //don't use aliasing in case of searchables
             'searchable' => [
                 [
@@ -150,6 +169,7 @@ class UserDataGrid
                     'label' => 'Role Name',
                 ]
             ],
+
             'operators' => [
                 'eq' => "=",
                 'lt' => "<",
@@ -161,15 +181,13 @@ class UserDataGrid
                 'like' => "like",
                 'nlike' => "not like",
             ],
-            // 'css' => []
 
+            // 'css' => []
         ]);
 
     }
 
     public function render() {
-
         return $this->createUserDataGrid()->render();
-
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
index 0c91c86df..90b463e3e 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
@@ -1,7 +1,6 @@
 <div class="aside-nav">
     <ul>
         @if (request()->route()->getName() != 'admin.configuration.index')
-
             <?php $keys = explode('.', $menu->currentKey);  ?>
 
             @foreach(array_get($menu->items, current($keys) . '.children') as $item)
@@ -15,11 +14,8 @@
                     </a>
                 </li>
             @endforeach
-        
         @else
-
             @foreach($config->items as $key => $item)
-                
                 <li class="{{ $item['key'] == request()->route('slug') ? 'active' : '' }}">
                     <a href="{{ route('admin.configuration.index', $item['key']) }}">
                         {{ isset($item['name']) ? $item['name'] : '' }}
@@ -29,9 +25,7 @@
                         @endif
                     </a>
                 </li>
-
             @endforeach
-
         @endif
     </ul>
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
index 171e1ee84..2988384a7 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
@@ -1,10 +1,8 @@
 <div class="tabs">
     <ul>
         @if (request()->route()->getName() != 'admin.configuration.index')
-
             <?php $keys = explode('.', $menu->currentKey);  ?>
 
-            
             @foreach(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
                 <li class="{{ $menu->getActive($item) }}">
                     <a href="{{ $item['url'] }}">
@@ -12,23 +10,16 @@
                     </a>
                 </li>
             @endforeach
-        
         @else
-            
             @if (array_get($config->items, request()->route('slug') . '.children'))
-
                 @foreach (array_get($config->items, request()->route('slug') . '.children') as $key => $item)
-
                     <li class="{{ $key == request()->route('slug2') ? 'active' : '' }}">
                         <a href="{{ route('admin.configuration.index', (request()->route('slug') . '/' . $key)) }}">
                             {{ $item['name'] }}
                         </a>
                     </li>
-
                 @endforeach
-
             @endif
-
         @endif
     </ul>
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
index 42d49f045..cf16a0673 100644
--- a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
@@ -27,7 +27,7 @@
                         <div slot="body">
                             <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                                 <label for="name" class="required">{{ __('admin::app.users.users.name') }}</label>
-                                <input type="text" v-validate="'required'" class="control" id="email" name="name" data-vv-as="&quot;{{ __('admin::app.users.users.name') }}&quot;"/>
+                                <input type="text" v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.users.users.name') }}&quot;"/>
                                 <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
                             </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
index f4d64caa9..d2599ed8c 100644
--- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
@@ -72,6 +72,7 @@
                                 <label for="status">{{ __('admin::app.users.users.status') }}</label>
                                 <span class="checkbox">
                                     <input type="checkbox" id="status" name="status" value="{{ $user->status }}" {{ $user->status ? 'checked' : '' }}>
+
                                     <label class="checkbox-view" for="status"></label>
                                     {{ __('admin::app.users.users.account-is-active') }}
                                 </span>
diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
index b5fddbbc0..4df993265 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
@@ -99,7 +99,7 @@ class CustomerController extends Controller
             'gender' => 'required',
             'date_of_birth' => 'date',
             'email' => 'email|unique:customers,email,'.$id,
-            'password' => 'confirmed|required_if:oldpassword,!=,null'
+            'password' => 'confirmed'
         ]);
 
         $data = collect(request()->input())->except('_token')->toArray();
diff --git a/packages/Webkul/Ui/webpack.mix.js b/packages/Webkul/Ui/webpack.mix.js
index 4fa81616a..54dca326b 100644
--- a/packages/Webkul/Ui/webpack.mix.js
+++ b/packages/Webkul/Ui/webpack.mix.js
@@ -22,4 +22,4 @@ mix.js(
 
 if (mix.inProduction()) {
     mix.version();
-}
+}
\ No newline at end of file
diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php
index c3b2e36c3..982511ee5 100644
--- a/packages/Webkul/User/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/User/src/Http/Controllers/SessionController.php
@@ -63,12 +63,21 @@ class SessionController extends Controller
         ]);
 
         $remember = request('remember');
-        if (! auth()->guard('admin')->attempt(request(['email', 'password']), $remember)) {
+
+        if (!auth()->guard('admin')->attempt(request(['email', 'password']), $remember)) {
             session()->flash('error', 'Please check your credentials and try again.');
 
             return back();
         }
 
+        if (auth()->guard('admin')->user()->status == 0) {
+            session()->flash('warning', 'Your account is yet to be activated, please contact administrator.');
+
+            auth()->guard('admin')->logout();
+
+            return redirect()->route('admin.session.create');
+        }
+
         return redirect()->intended(route($this->_config['redirect']));
     }
 
diff --git a/packages/Webkul/User/src/Http/Requests/UserForm.php b/packages/Webkul/User/src/Http/Requests/UserForm.php
index e8ca87ec1..67b97171c 100644
--- a/packages/Webkul/User/src/Http/Requests/UserForm.php
+++ b/packages/Webkul/User/src/Http/Requests/UserForm.php
@@ -29,10 +29,11 @@ class UserForm extends FormRequest
             'name' => 'required',
             'email' => 'email|unique:admins,email',
             'password' => 'nullable|confirmed',
+            'status' => 'sometimes',
             'role_id' => 'required'
         ];
 
-        if($this->method() == 'PUT') {
+        if ($this->method() == 'PUT') {
             $this->rules['email'] = 'email|unique:admins,email,' . $this->route('id');
         }