close #2122 Fixed: If the user clicked the 'can login?', password must be required.
This commit is contained in:
parent
eff62d5cfb
commit
f0aa9af282
@ -320,28 +320,4 @@ class Customers extends Controller
|
|||||||
|
|
||||||
return response()->json($customer);
|
return response()->json($customer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function field(BaseRequest $request)
|
|
||||||
{
|
|
||||||
$html = '';
|
|
||||||
|
|
||||||
if ($request['fields']) {
|
|
||||||
foreach ($request['fields'] as $field) {
|
|
||||||
switch ($field) {
|
|
||||||
case 'password':
|
|
||||||
$html .= \Form::passwordGroup('password', trans('auth.password.current'), 'key', [], 'col-md-6 password');
|
|
||||||
break;
|
|
||||||
case 'password_confirmation':
|
|
||||||
$html .= \Form::passwordGroup('password_confirmation', trans('auth.password.current_confirm'), 'key', [], 'col-md-6 password');
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$json = [
|
|
||||||
'html' => $html
|
|
||||||
];
|
|
||||||
|
|
||||||
return response()->json($json);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -54,9 +54,9 @@
|
|||||||
@stack('create_user_input_end')
|
@stack('create_user_input_end')
|
||||||
|
|
||||||
<div v-if="can_login" class="row col-md-12">
|
<div v-if="can_login" class="row col-md-12">
|
||||||
{{Form::passwordGroup('password', trans('auth.password.current'), 'key', [], 'col-md-6 password')}}
|
{{Form::passwordGroup('password', trans('auth.password.current'), 'key', ['required' => 'required'], 'col-md-6 password')}}
|
||||||
|
|
||||||
{{Form::passwordGroup('password_confirmation', trans('auth.password.current_confirm'), 'key', [], 'col-md-6 password')}}
|
{{Form::passwordGroup('password_confirmation', trans('auth.password.current_confirm'), 'key', ['required' => 'required'], 'col-md-6 password')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -64,9 +64,9 @@
|
|||||||
@stack('create_user_input_end')
|
@stack('create_user_input_end')
|
||||||
|
|
||||||
<div v-if="can_login" class="row col-md-12">
|
<div v-if="can_login" class="row col-md-12">
|
||||||
{{Form::passwordGroup('password', trans('auth.password.current'), 'key', [], 'col-md-6 password')}}
|
{{Form::passwordGroup('password', trans('auth.password.current'), 'key', ['required' => 'required'], 'col-md-6 password')}}
|
||||||
|
|
||||||
{{Form::passwordGroup('password_confirmation', trans('auth.password.current_confirm'), 'key', [], 'col-md-6 password')}}
|
{{Form::passwordGroup('password_confirmation', trans('auth.password.current_confirm'), 'key', ['required' => 'required'], 'col-md-6 password')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -88,7 +88,6 @@ Route::group(['prefix' => 'sales'], function () {
|
|||||||
|
|
||||||
Route::get('customers/currency', 'Sales\Customers@currency');
|
Route::get('customers/currency', 'Sales\Customers@currency');
|
||||||
Route::get('customers/{customer}/duplicate', 'Sales\Customers@duplicate')->name('customers.duplicate');
|
Route::get('customers/{customer}/duplicate', 'Sales\Customers@duplicate')->name('customers.duplicate');
|
||||||
Route::post('customers/field', 'Sales\Customers@field')->name('customers.field');
|
|
||||||
Route::post('customers/import', 'Sales\Customers@import')->name('customers.import');
|
Route::post('customers/import', 'Sales\Customers@import')->name('customers.import');
|
||||||
Route::get('customers/export', 'Sales\Customers@export')->name('customers.export');
|
Route::get('customers/export', 'Sales\Customers@export')->name('customers.export');
|
||||||
Route::get('customers/{customer}/enable', 'Sales\Customers@enable')->name('customers.enable');
|
Route::get('customers/{customer}/enable', 'Sales\Customers@enable')->name('customers.enable');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user