From 5c63770b6bb0968cfb7bcc94811e0bbf608e93d7 Mon Sep 17 00:00:00 2001
From: asift798 <asifmomin798@gmail.com>
Date: Mon, 21 Mar 2022 12:04:17 +0530
Subject: [PATCH] added unique validation and help text for company slug field

---
 app/Http/Requests/CompaniesRequest.php                         | 3 ++-
 app/Http/Requests/CompanyRequest.php                           | 3 ++-
 .../scripts/admin/components/modal-components/CompanyModal.vue | 1 +
 .../scripts/admin/views/installation/Step7CompanyInfo.vue      | 1 +
 resources/scripts/admin/views/settings/CompanyInfoSettings.vue | 1 +
 resources/scripts/locales/en.json                              | 2 ++
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/CompaniesRequest.php b/app/Http/Requests/CompaniesRequest.php
index 53002d47..661d8777 100644
--- a/app/Http/Requests/CompaniesRequest.php
+++ b/app/Http/Requests/CompaniesRequest.php
@@ -34,7 +34,8 @@ class CompaniesRequest extends FormRequest
                 'required'
             ],
             'slug' => [
-                'required'
+                'required',
+                Rule::unique('companies')
             ],
             'address.name' => [
                 'nullable',
diff --git a/app/Http/Requests/CompanyRequest.php b/app/Http/Requests/CompanyRequest.php
index c86cd645..dc22b1ae 100644
--- a/app/Http/Requests/CompanyRequest.php
+++ b/app/Http/Requests/CompanyRequest.php
@@ -30,7 +30,8 @@ class CompanyRequest extends FormRequest
                 Rule::unique('companies')->ignore($this->header('company'), 'id'),
             ],
             'slug' => [
-                'nullable'
+                'required',
+                Rule::unique('companies')->ignore($this->header('company'), 'id'),
             ],
             'address.country_id' => [
                 'required',
diff --git a/resources/scripts/admin/components/modal-components/CompanyModal.vue b/resources/scripts/admin/components/modal-components/CompanyModal.vue
index 61cdce02..011218a1 100644
--- a/resources/scripts/admin/components/modal-components/CompanyModal.vue
+++ b/resources/scripts/admin/components/modal-components/CompanyModal.vue
@@ -50,6 +50,7 @@
 
           <BaseInputGroup
             :label="$tc('settings.company_info.company_slug')"
+            :help-text="$t('settings.company_info.company_slug_help_text')"
             :error="
               v$.newCompanyForm.slug.$error &&
               v$.newCompanyForm.slug.$errors[0].$message
diff --git a/resources/scripts/admin/views/installation/Step7CompanyInfo.vue b/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
index 12a0a6df..9cd2f0c4 100644
--- a/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
+++ b/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
@@ -36,6 +36,7 @@
 
         <BaseInputGroup
           :label="$tc('wizard.company_slug')"
+          :help-text="$t('wizard.company_slug_help_text')"
           :error="
             v$.companyForm.slug.$error &&
             v$.companyForm.slug.$errors[0].$message
diff --git a/resources/scripts/admin/views/settings/CompanyInfoSettings.vue b/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
index d3723910..e55880e5 100644
--- a/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
+++ b/resources/scripts/admin/views/settings/CompanyInfoSettings.vue
@@ -30,6 +30,7 @@
 
         <BaseInputGroup
           :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"
           required
         >
diff --git a/resources/scripts/locales/en.json b/resources/scripts/locales/en.json
index 7f273fa9..0cc68a90 100644
--- a/resources/scripts/locales/en.json
+++ b/resources/scripts/locales/en.json
@@ -864,6 +864,7 @@
       "company_info": "Company info",
       "company_name": "Company Name",
       "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",
       "section_description": "Information about your company that will be displayed on invoices, estimates and other documents created by Crater.",
       "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_name": "Company Name",
     "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",
     "logo_preview": "Logo Preview",
     "preferences": "Company Preferences",