From 880f1a620f435eddf91479f08de4c7a033484b71 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 25 Aug 2022 08:10:26 +1000 Subject: [PATCH] Fixes for project with both project and client id --- app/Http/Requests/Expense/StoreExpenseRequest.php | 2 +- app/Http/Requests/Expense/UpdateExpenseRequest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php index b08ee31f5de8..0c964fef9016 100644 --- a/app/Http/Requests/Expense/StoreExpenseRequest.php +++ b/app/Http/Requests/Expense/StoreExpenseRequest.php @@ -69,7 +69,7 @@ class StoreExpenseRequest 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/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php index aabe07f6593c..26b144731048 100644 --- a/app/Http/Requests/Expense/UpdateExpenseRequest.php +++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php @@ -64,7 +64,7 @@ class UpdateExpenseRequest 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;