diff --git a/app/Http/Requests/Task/StoreTaskRequest.php b/app/Http/Requests/Task/StoreTaskRequest.php index 8d0d7af7b85e..f73a7cb5fcd8 100644 --- a/app/Http/Requests/Task/StoreTaskRequest.php +++ b/app/Http/Requests/Task/StoreTaskRequest.php @@ -70,8 +70,8 @@ class StoreTaskRequest extends Request /* Ensure the project is related */ if (array_key_exists('project_id', $input) && isset($input['project_id'])) { - $project = Project::withTrashed()->find($input['project_id'])->company()->first(); - + $project = Project::withTrashed()->where('id', $input['project_id'])->company()->first(); +; if($project){ $input['client_id'] = $project->client_id; } diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php index c60924df0b71..7e4babdb3f08 100644 --- a/app/Http/Requests/Task/UpdateTaskRequest.php +++ b/app/Http/Requests/Task/UpdateTaskRequest.php @@ -69,7 +69,7 @@ class UpdateTaskRequest extends Request /* Ensure the project is related */ if (array_key_exists('project_id', $input) && isset($input['project_id'])) { - $project = Project::withTrashed()->find($input['project_id'])->company()->first(); + $project = Project::withTrashed()->where('id', $input['project_id'])->company()->first(); if($project){ $input['client_id'] = $project->client_id; diff --git a/app/Utils/Number.php b/app/Utils/Number.php index 2aa06e0f9748..e7e0c66673b5 100644 --- a/app/Utils/Number.php +++ b/app/Utils/Number.php @@ -90,7 +90,7 @@ class Number return (float) $s; } - // remove all seperators from first part and keep the end + // remove all separators from first part and keep the end $s = str_replace('.', '', substr($s, 0, -3)).substr($s, -3); // return float