mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-19 11:14:06 +00:00
Auto-generate company slug server-side in CompanyRequest
CompanyRequest::getCompanyPayload() accepted 'slug' from the client but never generated it, so the installation wizard (which PUTs /api/v1/company) left the slug empty when setting up the first company. Match the sibling CompaniesRequest (which already does Str::slug($this->name)) and generate the slug from the name server-side; drop the now-unused 'slug' validation rule.
Fixes the same bug that master's ed7af3fc tried to fix client-side with a lodash deburr + regex workaround in Step7CompanyInfo.vue. v3.0's installation wizard is a rewrite under resources/scripts/features/installation/CompanyView.vue and doesn't carry that workaround, so the cleaner fix is to make the backend authoritative like CompaniesRequest already is.
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Http\Requests;
|
namespace App\Http\Requests;
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
use Illuminate\Foundation\Http\FormRequest;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
class CompanyRequest extends FormRequest
|
class CompanyRequest extends FormRequest
|
||||||
@@ -31,9 +32,6 @@ class CompanyRequest extends FormRequest
|
|||||||
'tax_id' => [
|
'tax_id' => [
|
||||||
'nullable',
|
'nullable',
|
||||||
],
|
],
|
||||||
'slug' => [
|
|
||||||
'nullable',
|
|
||||||
],
|
|
||||||
'address.country_id' => [
|
'address.country_id' => [
|
||||||
'required',
|
'required',
|
||||||
],
|
],
|
||||||
@@ -45,10 +43,12 @@ class CompanyRequest extends FormRequest
|
|||||||
return collect($this->validated())
|
return collect($this->validated())
|
||||||
->only([
|
->only([
|
||||||
'name',
|
'name',
|
||||||
'slug',
|
|
||||||
'vat_id',
|
'vat_id',
|
||||||
'tax_id',
|
'tax_id',
|
||||||
])
|
])
|
||||||
|
->merge([
|
||||||
|
'slug' => Str::slug($this->name),
|
||||||
|
])
|
||||||
->toArray();
|
->toArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user