From 6400ece913cceeafeed509f566eb167e90f38ba9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 23 Dec 2022 12:20:15 +1100 Subject: [PATCH] Minor fixes for expense validation --- app/Http/Requests/Expense/StoreExpenseRequest.php | 2 +- app/Http/Requests/Expense/UpdateExpenseRequest.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php index a36369f01e90..69d297127ce4 100644 --- a/app/Http/Requests/Expense/StoreExpenseRequest.php +++ b/app/Http/Requests/Expense/StoreExpenseRequest.php @@ -41,7 +41,7 @@ class StoreExpenseRequest extends Request $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id); } - if (! empty($this->client_id)) { + if ($this->client_id) { $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id; } diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php index 348cad69ddba..05dae8421288 100644 --- a/app/Http/Requests/Expense/UpdateExpenseRequest.php +++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php @@ -41,6 +41,10 @@ class UpdateExpenseRequest extends Request $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id); } + if ($this->client_id) { + $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id; + } + $rules['category_id'] = 'bail|sometimes|nullable|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; return $this->globalRules($rules);