shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

akaunting 3.0 (the last dance)

Browse Source
This commit is contained in:
Burak Civan
2022-06-01 10:15:55 +03:00
parent cead09f6d4
commit d9c0764572
3812 changed files with 126831 additions and 102949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Requests/Auth/User.php
View File

@ -29,14 +29,13 @@ class User extends FormRequest
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024 . '|dimensions:max_width=1000,max_height=1000';
}
$email = 'required|email';
$email = 'required|email:rfc,dns';
if ($this->getMethod() == 'PATCH') {
// Updating user
$id = is_numeric($this->user) ? $this->user : $this->user->getAttribute('id');
$password = '';
$companies = $this->user->can('read-common-companies') ? 'required' : '';
$roles = $this->user->can('read-auth-roles') ? 'required|array' : '';
$roles = $this->user->can('read-auth-roles') ? 'required|string' : '';
if ($this->user->contact) {
$email .= '|unique:contacts,NULL,'
@ -48,17 +47,22 @@ class User extends FormRequest
} else {
// Creating user
$id = null;
$password = 'required|';
$companies = 'required';
$roles = 'required|array';
$roles = 'required|string';
}
$email .= '|unique:users,email,' . $id . ',id,deleted_at,NULL';
$change_password = $this->request->get('change_password') == true || $this->request->get('change_password') != null;
$current_password = $change_password ? '|current_password' : '';
$password = $change_password ? '|confirmed' : '';
return [
'name' => 'required|string',
'email' => $email,
'password' => $password . 'confirmed',
'current_password' => 'required_if:change_password,true' . $current_password,
'password' => 'required_if:change_password,true' . $password,
'companies' => $companies,
'roles' => $roles,
'picture' => $picture,