waqas
/
Akaunting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3149 from kreshnikg/fix-request-validation-postgresql 

Fix request validation errors
This commit is contained in:
Cüneyt Şentürk 2024-04-30 14:14:41 +01:00 committed by GitHub
parent c599e923e9 a2ceebf46d
commit 30fe0e6ecd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ class User extends FormRequest
$roles = 'required|string';
}
$email .= '|unique:users,email,' . $id . ',id,deleted_at,NULL';
$email .= '|unique:users,email,' . ($id ?? 'null') . ',id,deleted_at,NULL';
$change_password = $this->request->get('change_password') == true || $this->request->get('change_password') != null;

2
app/Http/Requests/Banking/Transaction.php
View File

@ -39,7 +39,7 @@ class Transaction extends FormRequest
$rules = [
'type' => 'required|string',
'number' => 'required|string|unique:transactions,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
'number' => 'required|string|unique:transactions,NULL,' . ($id ?? 'null') . ',id,company_id,' . $company_id . ',deleted_at,NULL',
'account_id' => 'required|integer',
'paid_at' => 'required|date_format:Y-m-d H:i:s',
'amount' => 'required|amount:0',

2
app/Http/Requests/Document/Document.php
View File

@ -47,7 +47,7 @@ class Document extends FormRequest
$rules = [
'type' => 'required|string',
'document_number' => 'required|string|unique:documents,NULL,' . $id . ',id,type,' . $type . ',company_id,' . $company_id . ',deleted_at,NULL',
'document_number' => 'required|string|unique:documents,NULL,' . ($id ?? 'null') . ',id,type,' . $type . ',company_id,' . $company_id . ',deleted_at,NULL',
//'status' => 'required|string|in:draft,paid,partial,sent,received,viewed,cancelled',
'status' => 'required|string',
'issued_at' => 'required|date_format:Y-m-d H:i:s|before_or_equal:due_at',

2
app/Http/Requests/Setting/Currency.php
View File

@ -25,7 +25,7 @@ class Currency extends FormRequest
return [
'name' => 'required|string',
'code' => 'required|string|unique:currencies,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
'code' => 'required|string|unique:currencies,NULL,' . ($id ?? 'null') . ',id,company_id,' . $company_id . ',deleted_at,NULL',
'rate' => 'required|gt:0',
'enabled' => 'integer|boolean',
'default_currency' => 'nullable|boolean',

2
app/Http/Requests/Setting/Tax.php
View File

@ -27,7 +27,7 @@ class Tax extends FormRequest
$type = 'required|string|in:fixed,normal,inclusive,withholding,compound';
if (!empty($this->request->get('type')) && $this->request->get('type') == 'compound') {
$type .= '|unique:taxes,NULL,' . $id . ',id,company_id,' . $company_id . ',type,compound,deleted_at,NULL';
$type .= '|unique:taxes,NULL,' . ($id ?? 'null') . ',id,company_id,' . $company_id . ',type,compound,deleted_at,NULL';
}
return [