From 1f55ecb374fcc05b0a106c9c6477357471319495 Mon Sep 17 00:00:00 2001
From: Abhishek Kathuria <abhishekkathuria.oc522@webkul.com>
Date: Thu, 25 Aug 2022 15:49:33 +0530
Subject: [PATCH] Fixed issue #6481

---
 .../views/catalog/attributes/create.blade.php        |  6 +++---
 .../views/catalog/attributes/edit.blade.php          | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
index 73360f8f5..af4190bae 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
@@ -313,7 +313,7 @@
 
                             <td>
                                 <div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
-                                    <input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
+                                    <input type="text" v-validate="getOptionValidation(row,'')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
                                     <span class="control-error" v-if="errors.has(adminName(row))">@{{ errors.first(adminName(row)) }}</span>
                                 </div>
                             </td>
@@ -329,7 +329,7 @@
 
                             <td>
                                 <div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
-                                    <input type="text" v-validate="'required|numeric'" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
+                                    <input type="text" v-validate="getOptionValidation(row,'')" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
                                     <span class="control-error" v-if="errors.has(sortOrderName(row))">@{{ errors.first(sortOrderName(row)) }}</span>
                                 </div>
                             </td>
@@ -458,7 +458,7 @@
                         return '';
                     }
 
-                    return ('{{ app()->getLocale() }}' === localeCode) ? 'required' : '';
+                        return ('{{ app()->getLocale() }}' === localeCode) || localeCode == ""  ? 'required' : '';
                 }
             },
 
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
index 268f73801..5b9f26046 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
@@ -387,7 +387,7 @@
 
                             <td>
                                 <div class="control-group" :class="[errors.has(adminName(row)) ? 'has-error' : '']">
-                                    <input type="text" v-validate="'required'" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
+                                    <input type="text" v-validate="getOptionValidation(row, '')" v-model="row['admin_name']" :name="adminName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.admin_name') }}&quot;"/>
                                     <span class="control-error" v-if="errors.has(adminName(row))" v-text="errors.first(adminName(row))"></span>
                                 </div>
                             </td>
@@ -401,7 +401,7 @@
 
                             <td>
                                 <div class="control-group" :class="[errors.has(sortOrderName(row)) ? 'has-error' : '']">
-                                    <input type="text" v-validate="'required|numeric'" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
+                                    <input type="text" v-validate="getOptionValidation(row, '')" v-model="row['sort_order']" :name="sortOrderName(row)" class="control" data-vv-as="&quot;{{ __('admin::app.catalog.attributes.position') }}&quot;"/>
                                     <span class="control-error" v-if="errors.has(sortOrderName(row))" v-text="errors.first(sortOrderName(row))"></span>
                                 </div>
                             </td>
@@ -506,10 +506,12 @@
                                 'isDelete': false,
                             };
 
-                            if (option.label) {
+                            if (option.label == "") {
                                 self.isNullOptionChecked = true;
                                 self.idNullOption = option.id;
                                 row['notRequired'] = true;
+                            } else {
+                                row['notRequired'] = false;
                             }
 
                             option.translations.forEach((translation) => {
@@ -595,8 +597,8 @@
                     if (row.notRequired === true) {
                         return '';
                     }
-
-                    return (this.appLocale === localeCode) ? 'required' : '';
+                    
+                    return ('{{ app()->getLocale() }}' === localeCode) || localeCode == ""  ? 'required' : '';
                 },
             },
         });