From 325478a7a738ef086ff952f73d9e25332fef1eef Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 21 Sep 2023 13:57:54 +1000 Subject: [PATCH 1/2] Minor fixes : --- app/Http/Requests/TaxRate/UpdateTaxRateRequest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php index 2ce98c85ee39..75e3d76a1131 100644 --- a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php @@ -41,7 +41,7 @@ class UpdateTaxRateRequest extends Request $rules['rate'] = 'required|numeric'; if ($this->name) { - $rules['name'] = Rule::unique('tax_rates')->where('company_id', auth()->user()->company()->id)->ignore($this->tax_rate->id); + $rules['name'] = Rule::unique('tax_rates')->where('company_id', $user->company()->id)->ignore($this->tax_rate->id); } return $rules; From dbfacaa2f03ba00224094dcd10bae3d09da634b8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 21 Sep 2023 14:11:44 +1000 Subject: [PATCH 2/2] Fixes for tests --- app/Http/Requests/TaxRate/UpdateTaxRateRequest.php | 2 +- tests/Feature/TaxRateApiTest.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php index 75e3d76a1131..213245911026 100644 --- a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php @@ -38,7 +38,7 @@ class UpdateTaxRateRequest extends Request $rules = []; - $rules['rate'] = 'required|numeric'; + $rules['rate'] = 'sometimes|numeric'; if ($this->name) { $rules['name'] = Rule::unique('tax_rates')->where('company_id', $user->company()->id)->ignore($this->tax_rate->id); diff --git a/tests/Feature/TaxRateApiTest.php b/tests/Feature/TaxRateApiTest.php index 09b39e4e0b8f..13008615ba4e 100644 --- a/tests/Feature/TaxRateApiTest.php +++ b/tests/Feature/TaxRateApiTest.php @@ -29,6 +29,8 @@ class TaxRateApiTest extends TestCase use DatabaseTransactions; use MockAccountData; + public $faker; + protected function setUp() :void { parent::setUp();