TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

added unique validation and help text for company slug field

Browse Source
This commit is contained in:
asift798
2022-03-21 12:04:17 +05:30
parent 20c2502e31
commit 5c63770b6b
6 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Requests/CompaniesRequest.php
View File

@ -34,7 +34,8 @@ class CompaniesRequest extends FormRequest
'required' 'required'
], ],
'slug' => [ 'slug' => [
'required' 'required',
Rule::unique('companies')
], ],
'address.name' => [ 'address.name' => [
'nullable', 'nullable',

3
app/Http/Requests/CompanyRequest.php
View File

@ -30,7 +30,8 @@ class CompanyRequest extends FormRequest
Rule::unique('companies')->ignore($this->header('company'), 'id'), Rule::unique('companies')->ignore($this->header('company'), 'id'),
], ],
'slug' => [ 'slug' => [
'nullable' 'required',
Rule::unique('companies')->ignore($this->header('company'), 'id'),
], ],
'address.country_id' => [ 'address.country_id' => [
'required', 'required',

1
resources/scripts/admin/components/modal-components/CompanyModal.vue
View File

@ -50,6 +50,7 @@
<BaseInputGroup <BaseInputGroup
:label="$tc('settings.company_info.company_slug')" :label="$tc('settings.company_info.company_slug')"
:help-text="$t('settings.company_info.company_slug_help_text')"
:error=" :error="
v$.newCompanyForm.slug.$error && v$.newCompanyForm.slug.$error &&
v$.newCompanyForm.slug.$errors[0].$message v$.newCompanyForm.slug.$errors[0].$message

1
resources/scripts/admin/views/installation/Step7CompanyInfo.vue
View File

@ -36,6 +36,7 @@
<BaseInputGroup <BaseInputGroup
:label="$tc('wizard.company_slug')" :label="$tc('wizard.company_slug')"
:help-text="$t('wizard.company_slug_help_text')"
:error=" :error="
v$.companyForm.slug.$error && v$.companyForm.slug.$error &&
v$.companyForm.slug.$errors[0].$message v$.companyForm.slug.$errors[0].$message

1
resources/scripts/admin/views/settings/CompanyInfoSettings.vue
View File

@ -30,6 +30,7 @@
<BaseInputGroup <BaseInputGroup
:label="$tc('settings.company_info.company_slug')" :label="$tc('settings.company_info.company_slug')"
:help-text="$t('settings.company_info.company_slug_help_text')"
:error="v$.slug.$error && v$.slug.$errors[0].$message" :error="v$.slug.$error && v$.slug.$errors[0].$message"
required required
> >

2
resources/scripts/locales/en.json
View File

@ -864,6 +864,7 @@
"company_info": "Company info", "company_info": "Company info",
"company_name": "Company Name", "company_name": "Company Name",
"company_slug": "Company Slug", "company_slug": "Company Slug",
"company_slug_help_text": "A unique URL friendly name for your company. It will be used for the URL of your Customer Portal.",
"company_logo": "Company Logo", "company_logo": "Company Logo",
"section_description": "Information about your company that will be displayed on invoices, estimates and other documents created by Crater.", "section_description": "Information about your company that will be displayed on invoices, estimates and other documents created by Crater.",
"phone": "Phone", "phone": "Phone",
@ -1326,6 +1327,7 @@
"company_info_desc": "This information will be displayed on invoices. Note that you can edit this later on settings page.", "company_info_desc": "This information will be displayed on invoices. Note that you can edit this later on settings page.",
"company_name": "Company Name", "company_name": "Company Name",
"company_slug": "Company Slug", "company_slug": "Company Slug",
"company_slug_help_text": "A unique URL friendly name for your company. It will be used for the URL of your Customer Portal.",
"company_logo": "Company Logo", "company_logo": "Company Logo",
"logo_preview": "Logo Preview", "logo_preview": "Logo Preview",
"preferences": "Company Preferences", "preferences": "Company Preferences",