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

Change validation rules to string

Browse Source
This commit is contained in:
Burak Çakırel 2021-04-29 16:09:10 +03:00
parent 09f83c2044
commit bee4056c3a
No known key found for this signature in database
GPG Key ID: 48FFBB7771B99C7C
3 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,13 +2,10 @@
namespace App\Http\Requests\Auth; namespace App\Http\Requests\Auth;
use App\Traits\Contacts;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class User extends FormRequest class User extends FormRequest
{ {
use Contacts;
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
@ -33,7 +30,7 @@ class User extends FormRequest
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024; $picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
} }
$email = ['required', 'email']; $email = 'required|email';
if ($this->getMethod() == 'PATCH') { if ($this->getMethod() == 'PATCH') {
// Updating user // Updating user
@ -43,11 +40,11 @@ class User extends FormRequest
$roles = $this->user->can('read-auth-roles') ? 'required' : ''; $roles = $this->user->can('read-auth-roles') ? 'required' : '';
if ($this->user->contact) { if ($this->user->contact) {
$email[] = Rule::unique('contacts') $email .= '|unique:contacts,NULL,'
->ignore($this->user->contact->id) . $this->user->contact->id . ',id'
->where('company_id', company_id()) . ',company_id,' . company_id()
->where('type', $this->getCustomerTypes()) . ',type,customer'
->where('deleted_at'); . ',deleted_at,NULL';
} }
} else { } else {
// Creating user // Creating user
@ -57,7 +54,7 @@ class User extends FormRequest
$roles = 'required'; $roles = 'required';
} }
$email[] = Rule::unique('users')->ignore($id)->where('deleted_at'); $email .= '|unique:users,email,' . $id . ',id,deleted_at,NULL';
return [ return [
'name' => 'required|string', 'name' => 'required|string',

18
app/Http/Requests/Common/Contact.php
View File

@ -3,7 +3,6 @@
namespace App\Http\Requests\Common; namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest; use App\Abstracts\Http\FormRequest;
use Illuminate\Validation\Rule;
class Contact extends FormRequest class Contact extends FormRequest
{ {
@ -24,7 +23,7 @@ class Contact extends FormRequest
*/ */
public function rules() public function rules()
{ {
$email = []; $email = '';
$required = ''; $required = '';
$type = $this->request->get('type', 'customer'); $type = $this->request->get('type', 'customer');
@ -44,17 +43,14 @@ class Contact extends FormRequest
} }
if (!empty($this->request->get('email'))) { if (!empty($this->request->get('email'))) {
$email[] = 'email'; $email .= 'email|unique:contacts,NULL,'
$email[] = Rule::unique('contacts') . $id . ',id'
->ignore($id) . ',company_id,' . $company_id
->where('company_id', $company_id) . ',type,' . $type
->where('type', $type) . ',deleted_at,NULL';
->where('deleted_at');
if (isset($model) && $this->$model->user_id) { if (isset($model) && $this->$model->user_id) {
$email[] = Rule::unique('users') $email .= '|unique:users,NULL,' . $this->$model->user_id . ',id,deleted_at,NULL';
->ignore($this->$model->user_id)
->where('deleted_at');
} }
} }

22
app/Http/Requests/Portal/Profile.php
View File

@ -2,14 +2,10 @@
namespace App\Http\Requests\Portal; namespace App\Http\Requests\Portal;
use App\Traits\Contacts;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class Profile extends FormRequest class Profile extends FormRequest
{ {
use Contacts;
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
* *
@ -35,20 +31,14 @@ class Profile extends FormRequest
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024; $picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
} }
$email = [ $email = 'required|email|unique:users,email,' . $id . ',id,deleted_at,NULL';
'required',
'email',
Rule::unique('users')
->ignore($id)
->where('deleted_at'),
];
if (user()->contact) { if (user()->contact) {
$email[] = Rule::unique('contacts') $email .= '|unique:contacts,NULL,'
->ignore(user()->contact->id) . user()->contact->id . ',id'
->where('company_id', company_id()) . ',company_id,' . company_id()
->where('type', $this->getCustomerTypes()) . ',type,customer'
->where('deleted_at'); . ',deleted_at,NULL';
} }
return [ return [