merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue and modified issue fix #333 #332 and #326

This commit is contained in:
prashant-webkul 2018-12-19 12:20:43 +05:30
parent 3c8807e7e9
commit 95d6d849f4
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
View File

@ -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>

11
packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
View File

@ -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') }}

10
packages/Webkul/User/src/Http/Controllers/UserController.php
View File

@ -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.');

3
packages/Webkul/User/src/Http/Requests/UserForm.php
View File

@ -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'
];