From 0dc9129e767814a9d8d8f59f7273261fb5503c58 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 30 Nov 2022 17:15:22 +1100 Subject: [PATCH] Fixes for expense category validation --- app/Http/Requests/Expense/StoreExpenseRequest.php | 2 ++ app/Http/Requests/Expense/UpdateExpenseRequest.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php index 019099c54f24..a36369f01e90 100644 --- a/app/Http/Requests/Expense/StoreExpenseRequest.php +++ b/app/Http/Requests/Expense/StoreExpenseRequest.php @@ -45,6 +45,8 @@ class StoreExpenseRequest extends Request $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id; } + $rules['category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; + return $this->globalRules($rules); } diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php index d8107dd3b4c9..348cad69ddba 100644 --- a/app/Http/Requests/Expense/UpdateExpenseRequest.php +++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php @@ -41,6 +41,8 @@ class UpdateExpenseRequest extends Request $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id); } + $rules['category_id'] = 'bail|sometimes|nullable|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0'; + return $this->globalRules($rules); }