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 @@
-
+
@{{ errors.first(adminName(row)) }}
|
@@ -329,7 +329,7 @@
-
+
@{{ errors.first(sortOrderName(row)) }}
|
@@ -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..d1c2debe7 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 @@
-
+
|
@@ -401,7 +401,7 @@
-
+
|
@@ -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' : '';
},
},
});