Merge branch 'develop'

src/components/07_agencies-management/FormBasicInfoAgencies.vue

@@ -68,7 +68,12 @@ type Options = { label: string; value: string };
         class="col-md-4 col-12"
         :label="$t('agencies.name')"
         v-model="name"
-        :rules="[(val: string) => !!val || $t('form.error.required')]"
+        :rules="[
+          (val) => !!val || $t('form.error.required'),
+          (val) =>
+            /^[A-Za-z0-9ก-๙\s&.,'-]+$/.test(val) ||
+            $t('form.error.branchNameField'),
+        ]"
       />
       <q-input
         for="input-agencies-name-en"
@@ -79,6 +84,15 @@ type Options = { label: string; value: string };
         class="col-md-4 col-12"
         :label="'Agencies Name'"
         v-model="nameEn"
+        :rules="
+          nameEn
+            ? [
+                (val) =>
+                  /^[A-Za-z0-9ก-๙\s&.,'-]+$/.test(val) ||
+                  $t('form.error.branchNameENField'),
+              ]
+            : []
+        "
       />
 
       <q-input

src/pages/03_customer-management/components/employer/EmployerFormAbout.vue

@@ -137,7 +137,12 @@ watch(
           @update:model-value="
             (v) => (typeof v === 'string' ? (registerName = v.trim()) : '')
           "
-          :rules="[(val: string) => !!val || $t('form.error.required')]"
+          :rules="[
+            (val) => !!val || $t('form.error.required'),
+            (val) =>
+              /^[A-Za-z0-9ก-๙\s&.,'-]+$/.test(val) ||
+              $t('form.error.branchNameField'),
+          ]"
         />
 
         <q-input
@@ -153,10 +158,10 @@ watch(
             (v) => (typeof v === 'string' ? (registerNameEN = v.trim()) : '')
           "
           :rules="[
-            (val: string) =>
+            (val) => !!val || $t('form.error.required'),
-              val === '' ||
+            (val) =>
-              /^[0-9A-Za-z\s.,]+$/.test(val) ||
+              /^[A-Za-z0-9\s&.,'-]+$/.test(val) ||
-              $t('form.error.letterOnly'),
+              $t('form.error.branchNameENField'),
           ]"
         />
       </div>