diff --git a/app/Http/Requests/TaxRate/StoreTaxRateRequest.php b/app/Http/Requests/TaxRate/StoreTaxRateRequest.php index 2f2ebee9709d..97c1b5684e95 100644 --- a/app/Http/Requests/TaxRate/StoreTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/StoreTaxRateRequest.php @@ -22,14 +22,20 @@ class StoreTaxRateRequest extends Request */ public function authorize() : bool { - return auth()->user()->isAdmin(); + /** @var \App\Models\User $user */ + $user = auth()->user(); + + return $user->isAdmin(); } public function rules() { + + /** @var \App\Models\User $user */ + $user = auth()->user(); + return [ - //'name' => 'required', - 'name' => 'required|unique:tax_rates,name,null,null,company_id,'.auth()->user()->companyId().',deleted_at,NULL', + 'name' => 'required|unique:tax_rates,name,null,null,company_id,'.$user->companyId().',deleted_at,NULL', 'rate' => 'required|numeric', ]; } diff --git a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php index 78a682eb980a..2ce98c85ee39 100644 --- a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php @@ -23,17 +23,25 @@ class UpdateTaxRateRequest extends Request */ public function authorize() : bool { - return auth()->user()->isAdmin(); + /** @var \App\Models\User $user */ + $user = auth()->user(); + + return $user->isAdmin(); + } public function rules() { + + /** @var \App\Models\User $user */ + $user = auth()->user(); + $rules = []; - $rules['rate'] = 'numeric'; + $rules['rate'] = 'required|numeric'; - if ($this->number) { - $rules['number'] = Rule::unique('tax_rates')->where('company_id', auth()->user()->company()->id)->ignore($this->tax_rate->id); + if ($this->name) { + $rules['name'] = Rule::unique('tax_rates')->where('company_id', auth()->user()->company()->id)->ignore($this->tax_rate->id); } return $rules;