From 95d6d849f4ecf3b1635f4ee8ac8cd42067060a15 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Wed, 19 Dec 2018 12:20:43 +0530
Subject: [PATCH] Fixed issue and modified issue fix #333 #332 and #326

---
 .../Resources/views/settings/locales/create.blade.php |  4 ++--
 .../src/Resources/views/users/users/edit.blade.php    | 11 +++++++++--
 .../User/src/Http/Controllers/UserController.php      | 10 ++++++++--
 packages/Webkul/User/src/Http/Requests/UserForm.php   |  3 ++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
index 91880fe00..6888e8df4 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
@@ -27,13 +27,13 @@
                     <accordian :title="'{{ __('admin::app.settings.locales.general') }}'" :active="true">
                         <div slot="body">
                             <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
-                                <label for="code">{{ __('admin::app.settings.locales.code') }}</label>
+                                <label for="code" class="required">{{ __('admin::app.settings.locales.code') }}</label>
                                 <input v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.settings.locales.code') }}&quot;" v-code/>
                                 <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                             </div>
 
                             <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
-                                <label for="name">{{ __('admin::app.settings.locales.name') }}</label>
+                                <label for="name" class="required">{{ __('admin::app.settings.locales.name') }}</label>
                                 <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.locales.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 d2599ed8c..261aa3ccf 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
@@ -28,7 +28,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;" value="{{ $user->name }}"/>
+                                <input type="text" v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.users.users.name') }}&quot;" value="{{ $user->name }}"/>
                                 <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
                             </div>
 
@@ -71,7 +71,14 @@
                             <div class="control-group">
                                 <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' : '' }}>
+                                    <input type="checkbox" id="status" name="status"
+                                    {{-- @if($user->status == 0)
+                                        value="false"
+                                    @else
+                                        value="true"
+                                    @endif --}}
+
+                                    {{ $user->status ? 'checked' : '' }}>
 
                                     <label class="checkbox-view" for="status"></label>
                                     {{ __('admin::app.users.users.account-is-active') }}
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index e3e3c6392..2757b1c40 100644
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -88,7 +88,7 @@ class UserController extends Controller
     public function store(UserForm $request)
     {
         $data = request()->all();
-        
+
         if(isset($data['password']) && $data['password'])
             $data['password'] = bcrypt($data['password']);
 
@@ -125,11 +125,17 @@ class UserController extends Controller
     {
         $data = request()->all();
 
-        if(!$data['password'])
+        if (!$data['password'])
             unset($data['password']);
         else
             $data['password'] = bcrypt($data['password']);
 
+        if (isset($data['status'])) {
+            $data['status'] = 1;
+        } else {
+            $data['status'] = 0;
+        }
+
         $this->admin->update($data, $id);
 
         session()->flash('success', 'User updated successfully.');
diff --git a/packages/Webkul/User/src/Http/Requests/UserForm.php b/packages/Webkul/User/src/Http/Requests/UserForm.php
index 67b97171c..974c093ad 100644
--- a/packages/Webkul/User/src/Http/Requests/UserForm.php
+++ b/packages/Webkul/User/src/Http/Requests/UserForm.php
@@ -25,11 +25,12 @@ class UserForm extends FormRequest
      */
     public function rules()
     {
+        dd(request()->input());
         $this->rules = [
             'name' => 'required',
             'email' => 'email|unique:admins,email',
             'password' => 'nullable|confirmed',
-            'status' => 'sometimes',
+            'status' => 'present',
             'role_id' => 'required'
         ];