From 8a854285328002f7b7af0eb5fb1a22d20789a3c8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 25 Oct 2021 13:19:46 +1100 Subject: [PATCH] Ensure recurring expenses have numeric for tax_amounts --- .../RecurringExpense/StoreRecurringExpenseRequest.php | 3 +++ .../RecurringExpense/UpdateRecurringExpenseRequest.php | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php index 675827b6cada..60abdf57cba8 100644 --- a/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php +++ b/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php @@ -42,6 +42,9 @@ class StoreRecurringExpenseRequest extends Request $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id; $rules['frequency_id'] = 'required|integer|digits_between:1,12'; + $rules['tax_amount1'] = 'numeric'; + $rules['tax_amount2'] = 'numeric'; + $rules['tax_amount3'] = 'numeric'; return $this->globalRules($rules); } diff --git a/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php index c1be81d1053a..4f03269bf77e 100644 --- a/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php +++ b/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php @@ -43,6 +43,10 @@ class UpdateRecurringExpenseRequest extends Request $rules['number'] = Rule::unique('recurring_expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->recurring_expense->id); } + $rules['tax_amount1'] = 'numeric'; + $rules['tax_amount2'] = 'numeric'; + $rules['tax_amount3'] = 'numeric'; + return $this->globalRules($rules); }