diff --git a/app/Http/Requests/Auth/User.php b/app/Http/Requests/Auth/User.php index 39c751f48..88e7a5cba 100644 --- a/app/Http/Requests/Auth/User.php +++ b/app/Http/Requests/Auth/User.php @@ -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; diff --git a/app/Http/Requests/Banking/Transaction.php b/app/Http/Requests/Banking/Transaction.php index b4f976fcf..15b0661f3 100644 --- a/app/Http/Requests/Banking/Transaction.php +++ b/app/Http/Requests/Banking/Transaction.php @@ -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', diff --git a/app/Http/Requests/Document/Document.php b/app/Http/Requests/Document/Document.php index 9b89e9b14..516dbfa8e 100644 --- a/app/Http/Requests/Document/Document.php +++ b/app/Http/Requests/Document/Document.php @@ -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', diff --git a/app/Http/Requests/Setting/Currency.php b/app/Http/Requests/Setting/Currency.php index 5e0319a14..c100ba690 100644 --- a/app/Http/Requests/Setting/Currency.php +++ b/app/Http/Requests/Setting/Currency.php @@ -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', diff --git a/app/Http/Requests/Setting/Tax.php b/app/Http/Requests/Setting/Tax.php index aa31098cc..dff5b8cb0 100644 --- a/app/Http/Requests/Setting/Tax.php +++ b/app/Http/Requests/Setting/Tax.php @@ -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 [