From 40934dcacf10b8580a2fa705ddda4a36eb10cb09 Mon Sep 17 00:00:00 2001
From: support <support@grandnode.com>
Date: Fri, 25 Aug 2023 19:33:54 +0200
Subject: [PATCH] Add data-val-required to input due to FluentValidator's lack
 of client-side validation support

---
 .../Views/Account/ChangePassword.cshtml       |  6 ++--
 .../Views/Account/DeleteAccount.cshtml        |  2 +-
 src/Web/Grand.Web/Views/Account/Info.cshtml   | 24 ++++++++--------
 src/Web/Grand.Web/Views/Account/Login.cshtml  |  6 ++--
 .../Account/Partials/CreateSubAccount.cshtml  |  8 +++---
 .../Account/Partials/EditSubAccount.cshtml    |  6 ++--
 .../Views/Account/PasswordRecovery.cshtml     |  2 +-
 .../Account/PasswordRecoveryConfirm.cshtml    |  4 +--
 .../Grand.Web/Views/Account/Register.cshtml   | 28 +++++++++----------
 .../Components/VendorContact/Default.cshtml   |  8 +++---
 src/Web/Grand.Web/Views/Contact/Index.cshtml  |  8 +++---
 .../MerchandiseReturn.cshtml                  |  2 +-
 .../Views/Order/Partials/AddOrderNote.cshtml  |  2 +-
 .../ProductEmailAFriend/Default.cshtml        |  8 ++++--
 .../Partials/AskQuestionOnProduct.cshtml      |  8 ++++--
 .../Partials/CreateOrUpdateAddress.cshtml     | 24 ++++++++--------
 .../Grand.Web/Views/Vendor/ApplyVendor.cshtml |  6 ++--
 src/Web/Grand.Web/Views/Vendor/Info.cshtml    |  5 ++--
 .../CreateOrUpdateVendorAddress.cshtml        | 16 +++++------
 .../Components/EmailWishlist/Default.cshtml   |  6 ++--
 .../Views/Wishlist/EmailWishlist.cshtml       |  8 ++++--
 21 files changed, 99 insertions(+), 88 deletions(-)

diff --git a/src/Web/Grand.Web/Views/Account/ChangePassword.cshtml b/src/Web/Grand.Web/Views/Account/ChangePassword.cshtml
index 4d5fac996..da24010c8 100644
--- a/src/Web/Grand.Web/Views/Account/ChangePassword.cshtml
+++ b/src/Web/Grand.Web/Views/Account/ChangePassword.cshtml
@@ -31,7 +31,7 @@
                     <fieldset class="form-group">
                         <validation-provider tag="div" rules="required" name="OldPassword" v-slot="{ errors, classes }">
                             <label asp-for="OldPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.OldPassword"]:</label>
-                            <input asp-for="OldPassword" v-model="changepassword.OldPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" />
+                            <input asp-for="OldPassword" v-model="changepassword.OldPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" data-val-required=@Loc["Account.ChangePassword.Fields.OldPassword.Required"]/>
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="OldPassword"></span>
                         </validation-provider>
@@ -39,7 +39,7 @@
                     <fieldset class="form-group">
                         <validation-provider tag="div" vid="changepassword.NewPassword" rules="required" v-slot="{ errors, classes }">
                             <label asp-for="NewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.NewPassword"]:</label>
-                            <input asp-for="NewPassword" v-model="changepassword.NewPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" />
+                            <input asp-for="NewPassword" v-model="changepassword.NewPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" data-val-required=@Loc["Account.ChangePassword.Fields.NewPassword.Required"]/>
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="NewPassword"></span>
                         </validation-provider>
@@ -47,7 +47,7 @@
                     <fieldset class="form-group">
                         <validation-provider tag="div" vid="changepassword.ConfirmNewPassword" rules="required|confirmed:@@changepassword.NewPassword" v-slot="{ errors, classes }">
                             <label asp-for="ConfirmNewPassword" class="col-form-label">@Loc["Account.ChangePassword.Fields.ConfirmNewPassword"]:</label>
-                            <input asp-for="ConfirmNewPassword" v-model="changepassword.ConfirmNewPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" />
+                            <input asp-for="ConfirmNewPassword" v-model="changepassword.ConfirmNewPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" data-val-equalto=@Loc["Account.ChangePassword.Fields.NewPassword.EnteredPasswordsDoNotMatch"] data-val-required=@Loc["Account.ChangePassword.Fields.ConfirmNewPassword.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="ConfirmNewPassword"></span>
                         </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Account/DeleteAccount.cshtml b/src/Web/Grand.Web/Views/Account/DeleteAccount.cshtml
index db810778f..48bda0512 100644
--- a/src/Web/Grand.Web/Views/Account/DeleteAccount.cshtml
+++ b/src/Web/Grand.Web/Views/Account/DeleteAccount.cshtml
@@ -23,7 +23,7 @@
                     <fieldset class="form-group">
                         <validation-provider tag="div" rules="required" name="Password" v-slot="{ errors, classes }">
                             <label asp-for="Password" class="col-form-label">@Loc["Account.DeleteAccount.Fields.Password"]:</label>
-                            <input asp-for="Password" v-model="deleteaccount.Password" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" />
+                            <input asp-for="Password" v-model="deleteaccount.Password" v-bind:class="[classes , 'form-control']" autofocus="autofocus" autocomplete="off" data-val-required=@Loc["Account.DeleteAccount.Fields.Password.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="Password"></span>
                         </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Account/Info.cshtml b/src/Web/Grand.Web/Views/Account/Info.cshtml
index c4e453070..8f3a829fc 100644
--- a/src/Web/Grand.Web/Views/Account/Info.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Info.cshtml
@@ -113,7 +113,7 @@
                                 <validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">
                                     <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>
                                     <span class="required">*</span>
-                                    <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                    <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.FirstName.Required"] />
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                     <span asp-validation-for="FirstName"></span>
                                 </validation-provider>
@@ -131,7 +131,7 @@
                                 <validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">
                                     <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>
                                     <span class="required">*</span>
-                                    <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                    <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.LastName.Required"] />
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                     <span asp-validation-for="LastName"></span>
                                 </validation-provider>
@@ -178,7 +178,7 @@
                             <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
                                 <label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>
                                 <span class="required">*</span>
-                                <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" asp-readonly=@(!Model.AllowUsersToChangeEmail) />
+                                <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" asp-readonly=@(!Model.AllowUsersToChangeEmail) data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.Fields.Email.Required"] />
                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                 <span asp-validation-for="Email"></span>
                             </validation-provider>
@@ -194,7 +194,7 @@
                                     <validation-provider tag="div" rules="required" name="Username" v-slot="{ errors, classes }">
                                         <label asp-for="Username" class="col-form-label">@Loc["Account.Fields.Username"]:</label>
                                         <span class="required">*</span>
-                                        <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                        <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.Username.Required"] />
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="Username"></span>
                                     </validation-provider>
@@ -232,7 +232,7 @@
                                         <validation-provider tag="div" rules="required" name="Company" v-slot="{ errors, classes }">
                                             <label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>
                                             <span class="required">*</span>
-                                            <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                            <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.Company.Required"]/>
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="Company"></span>
                                         </validation-provider>
@@ -280,7 +280,7 @@
                                             <validation-provider tag="div" rules="required" name="StreetAddress" v-slot="{ errors, classes }">
                                                 <label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>
                                                 <span class="required">*</span>
-                                                <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                                <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.StreetAddress.Required"]/>
                                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                                 <span asp-validation-for="StreetAddress"></span>
                                             </validation-provider>
@@ -302,7 +302,7 @@
                                             <validation-provider tag="div" rules="required" name="StreetAddress2" v-slot="{ errors, classes }">
                                                 <label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>
                                                 <span class="required">*</span>
-                                                <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                                <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.StreetAddress2.Required"]/>
                                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                                 <span asp-validation-for="StreetAddress2"></span>
                                             </validation-provider>
@@ -324,7 +324,7 @@
                                             <validation-provider tag="div" rules="required" name="ZipPostalCode" v-slot="{ errors, classes }">
                                                 <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>
                                                 <span class="required">*</span>
-                                                <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                                <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.ZipPostalCode.Required"]/>
                                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                                 <span asp-validation-for="ZipPostalCode"></span>
                                             </validation-provider>
@@ -346,7 +346,7 @@
                                             <validation-provider tag="div" rules="required" name="City" v-slot="{ errors, classes }">
                                                 <label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>
                                                 <span class="required">*</span>
-                                                <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                                <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.City.Required"]/>
                                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                                 <span asp-validation-for="City"></span>
                                             </validation-provider>
@@ -368,7 +368,7 @@
                                             <validation-provider tag="div" rules="required" name="CountryId" v-slot="{ errors, classes }">
                                                 <label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>
                                                 <span class="required">*</span>
-                                                <select asp-for="CountryId" asp-items="Model.AvailableCountries"
+                                                <select asp-for="CountryId" asp-items="Model.AvailableCountries" data-val-required=@Loc["Account.Fields.Country.Required"]
                                                         onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="customer.CountryId"></select>
                                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                                 <span asp-validation-for="CountryId"></span>
@@ -432,7 +432,7 @@
                                     <validation-provider tag="div" rules="required" name="Phone" v-slot="{ errors, classes }">
                                         <label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>
                                         <span class="required">*</span>
-                                        <input asp-for="Phone"  v-bind:class="[classes , 'form-control']" v-model="customer.Phone" />
+                                        <input asp-for="Phone"  v-bind:class="[classes , 'form-control']" v-model="customer.Phone" data-val-required=@Loc["Account.Fields.Phone.Required"]/>
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="Phone"></span>
                                     </validation-provider>
@@ -455,7 +455,7 @@
                                     <validation-provider tag="div" rules="required" name="Fax" v-slot="{ errors, classes }">
                                         <label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>
                                         <span class="required">*</span>
-                                        <input asp-for="Fax" v-bind:class="[classes , 'form-control']" v-model="customer.Fax" />
+                                        <input asp-for="Fax" v-bind:class="[classes , 'form-control']" v-model="customer.Fax" data-val-required=@Loc["Account.Fields.Fax.Required"] />
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="Fax"></span>
                                     </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Account/Login.cshtml b/src/Web/Grand.Web/Views/Account/Login.cshtml
index 39174eaa4..88540d4eb 100644
--- a/src/Web/Grand.Web/Views/Account/Login.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Login.cshtml
@@ -34,7 +34,7 @@
                                             </div>
                                             <div class="col-lg-9 col-12">
                                                 <validation-provider tag="div" rules="required" name="UserName" v-slot="{ errors, classes }">
-                                                    <input asp-for="Username" v-model="login.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                                    <input asp-for="Username" v-model="login.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Login.Fields.UserName.Required"] />
                                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                                     <span asp-validation-for="Username"></span>
                                                 </validation-provider>
@@ -49,7 +49,7 @@
                                             </div>
                                             <div class="col-lg-9 col-12">
                                                 <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
-                                                    <input asp-for="Email" v-model="login.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus"/>
+                                                    <input asp-for="Email" v-model="login.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.Login.Fields.Email.Required"] />
                                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                                     <span asp-validation-for="Email"></span>
                                                 </validation-provider>
@@ -63,7 +63,7 @@
                                         </div>
                                         <div class="col-lg-9 col-12">
                                             <validation-provider tag="div" rules="required" name="Password" v-slot="{ errors, classes }">
-                                                <input asp-for="Password" v-model="login.Password" v-bind:class="[classes , 'form-control']" autocomplete="off" />
+                                                <input asp-for="Password" v-model="login.Password" v-bind:class="[classes , 'form-control']" autocomplete="off" data-val-required=@Loc["Account.Login.Fields.Password.Required"] />
                                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                                 <span asp-validation-for="Password"></span>
                                             </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Account/Partials/CreateSubAccount.cshtml b/src/Web/Grand.Web/Views/Account/Partials/CreateSubAccount.cshtml
index 53a196403..922112660 100644
--- a/src/Web/Grand.Web/Views/Account/Partials/CreateSubAccount.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Partials/CreateSubAccount.cshtml
@@ -6,7 +6,7 @@
         <validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">
             <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>
             <span class="required">*</span>
-            <input asp-for="FirstName" v-model="createorupdatesubaccount.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+            <input asp-for="FirstName" v-model="createorupdatesubaccount.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.FirstName.Required"]  />
             <span class="field-validation-error">{{ errors[0] }}</span>
             <span asp-validation-for="FirstName"></span>
         </validation-provider>
@@ -15,7 +15,7 @@
         <validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">
             <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>
             <span class="required">*</span>
-            <input asp-for="LastName" v-model="createorupdatesubaccount.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+            <input asp-for="LastName" v-model="createorupdatesubaccount.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.LastName.Required"] />
             <span class="field-validation-error">{{ errors[0] }}</span>
             <span asp-validation-for="LastName"></span>
         </validation-provider>
@@ -24,7 +24,7 @@
         <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
             <label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>
             <span class="required">*</span>
-            <input asp-for="Email" v-model="createorupdatesubaccount.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+            <input asp-for="Email" v-model="createorupdatesubaccount.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.Fields.Email.Required"] />
             <span class="field-validation-error">{{ errors[0] }}</span>
             <span asp-validation-for="Email"></span>
         </validation-provider>
@@ -33,7 +33,7 @@
         <validation-provider tag="div" rules="required" name="Password" v-slot="{ errors, classes }">
             <label asp-for="Password" class="col-form-label">@Loc["Account.Fields.Password"]:</label>
             <span class="required">*</span>
-            <input asp-for="Password" v-model="createorupdatesubaccount.Password" v-bind:class="[classes , 'form-control']" autocomplete="off" />
+            <input asp-for="Password" v-model="createorupdatesubaccount.Password" v-bind:class="[classes , 'form-control']" autocomplete="off" data-val-required=@Loc["Account.Fields.Password.Required"]/>
             <span class="field-validation-error">{{ errors[0] }}</span>
             <span asp-validation-for="Password"></span>
         </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Account/Partials/EditSubAccount.cshtml b/src/Web/Grand.Web/Views/Account/Partials/EditSubAccount.cshtml
index 7fd50c0f2..880fa48a0 100644
--- a/src/Web/Grand.Web/Views/Account/Partials/EditSubAccount.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Partials/EditSubAccount.cshtml
@@ -6,7 +6,7 @@
         <validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">
             <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>
             <span class="required">*</span>
-            <input asp-for="FirstName" v-model="createorupdatesubaccount.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+            <input asp-for="FirstName" v-model="createorupdatesubaccount.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.FirstName.Required"] />
             <span class="field-validation-error">{{ errors[0] }}</span>
             <span asp-validation-for="FirstName"></span>
         </validation-provider>
@@ -15,7 +15,7 @@
         <validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">
             <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>
             <span class="required">*</span>
-            <input asp-for="LastName" v-model="createorupdatesubaccount.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+            <input asp-for="LastName" v-model="createorupdatesubaccount.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.LastName.Required"]/>
             <span class="field-validation-error">{{ errors[0] }}</span>
             <span asp-validation-for="LastName"></span>
         </validation-provider>
@@ -24,7 +24,7 @@
         <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
             <label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>
             <span class="required">*</span>
-            <input asp-for="Email" v-model="createorupdatesubaccount.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" asp-readonly=@(!customerSettings.AllowUsersToChangeEmail)/>
+            <input asp-for="Email" v-model="createorupdatesubaccount.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" asp-readonly=@(!customerSettings.AllowUsersToChangeEmail) data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.Fields.Email.Required"]/>
             <span class="field-validation-error">{{ errors[0] }}</span>
             <span asp-validation-for="Email"></span>
         </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml b/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml
index 4d04ea285..f34ba6588 100644
--- a/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml
+++ b/src/Web/Grand.Web/Views/Account/PasswordRecovery.cshtml
@@ -23,7 +23,7 @@
                 <div class="form-group">
                     <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
                         <label asp-for="Email" class="col-form-label">@Loc["Account.PasswordRecovery.Email"]:</label>
-                        <input asp-for="Email" v-model="passwordrecovery.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus"/>
+                        <input asp-for="Email" v-model="passwordrecovery.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.PasswordRecovery.Email.Required"]/>
                         <span class="field-validation-error">{{ errors[0] }}</span>
                         <span asp-validation-for="Email"></span>
                     </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml b/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml
index 8aae842a5..77b949239 100644
--- a/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml
+++ b/src/Web/Grand.Web/Views/Account/PasswordRecoveryConfirm.cshtml
@@ -19,12 +19,12 @@
             <div class="form-fields">
                 <div class="inputs">
                     <label asp-for="NewPassword" class="col-form-label">@Loc["Account.PasswordRecovery.NewPassword"]:</label>
-                    <input asp-for="NewPassword" class="form-control" />
+                    <input asp-for="NewPassword" class="form-control" data-val-required=@Loc["Account.PasswordRecovery.NewPassword.Required"] />
                     <span asp-validation-for="NewPassword"></span>
                 </div>
                 <div class="inputs">
                     <label asp-for="ConfirmNewPassword" class="col-form-label">@Loc["Account.PasswordRecovery.ConfirmNewPassword"]:</label>
-                    <input asp-for="ConfirmNewPassword" class="form-control" />
+                    <input asp-for="ConfirmNewPassword" class="form-control" data-val-equalto=@Loc["Account.PasswordRecovery.NewPassword.EnteredPasswordsDoNotMatch"] data-val-required=@Loc["Account.PasswordRecovery.ConfirmNewPassword.Required"] />
                     <span asp-validation-for="ConfirmNewPassword"></span>
                 </div>
             </div>
diff --git a/src/Web/Grand.Web/Views/Account/Register.cshtml b/src/Web/Grand.Web/Views/Account/Register.cshtml
index 595d7f921..50109f417 100644
--- a/src/Web/Grand.Web/Views/Account/Register.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Register.cshtml
@@ -104,7 +104,7 @@
                                 <validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">
                                     <label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>
                                     <span class="required">*</span>
-                                    <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                    <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.FirstName.Required"] />
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                     <span asp-validation-for="FirstName"></span>
                                 </validation-provider>
@@ -122,7 +122,7 @@
                                 <validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">
                                     <label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>
                                     <span class="required">*</span>
-                                    <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                    <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.LastName.Required"] />
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                     <span asp-validation-for="LastName"></span>
                                 </validation-provider>
@@ -164,7 +164,7 @@
                         <validation-provider tag="div" rules="required" name="Email" v-slot="{ errors, classes }">
                             <label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>
                             <span class="required">*</span>
-                            <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                            <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.Fields.Email.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="Email"></span>
                         </validation-provider>
@@ -179,7 +179,7 @@
                             </div>
                             <div class="col-12">
                                 <validation-provider tag="div" rules="required" name="Username" v-slot="{ errors, classes }">
-                                    <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                    <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.Username.Required"] />
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                     <span asp-validation-for="Username"></span>
                                 </validation-provider>
@@ -206,7 +206,7 @@
                                 <validation-provider tag="div" rules="required" name="Company" v-slot="{ errors, classes }">
                                     <label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>
                                     <span class="required">*</span>
-                                    <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                    <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.Company.Required"] />
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                     <span asp-validation-for="Company"></span>
                                 </validation-provider>
@@ -257,7 +257,7 @@
                                         <validation-provider tag="div" rules="required" name="StreetAddress" v-slot="{ errors, classes }">
                                             <label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>
                                             <span class="required">*</span>
-                                            <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                            <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.StreetAddress.Required"] />
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="StreetAddress"></span>
                                         </validation-provider>
@@ -279,7 +279,7 @@
                                         <validation-provider tag="div" rules="required" name="StreetAddress2" v-slot="{ errors, classes }">
                                             <label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>
                                             <span class="required">*</span>
-                                            <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                            <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.StreetAddress2.Required"] />
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="StreetAddress2"></span>
                                         </validation-provider>
@@ -301,7 +301,7 @@
                                         <validation-provider tag="div" rules="required" name="ZipPostalCode" v-slot="{ errors, classes }">
                                             <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>
                                             <span class="required">*</span>
-                                            <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                            <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.ZipPostalCode.Required"] />
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="ZipPostalCode"></span>
                                         </validation-provider>
@@ -323,7 +323,7 @@
                                         <validation-provider tag="div" rules="required" name="City" v-slot="{ errors, classes }">
                                             <label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>
                                             <span class="required">*</span>
-                                            <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                            <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.City.Required"] />
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="City"></span>
                                         </validation-provider>
@@ -345,7 +345,7 @@
                                         <validation-provider tag="div" rules="required" name="CountryId" v-slot="{ errors, classes }">
                                             <label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>
                                             <span class="required">*</span>
-                                            <select asp-for="CountryId" asp-items="Model.AvailableCountries"
+                                            <select asp-for="CountryId" asp-items="Model.AvailableCountries" data-val-required=@Loc["Account.Fields.Country.Required"] 
                                                     onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="customer.CountryId"></select>
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="CountryId"></span>
@@ -396,7 +396,7 @@
                                         <validation-provider tag="div" rules="required" name="Phone" v-slot="{ errors, classes }">
                                             <label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>
                                             <span class="required">*</span>
-                                            <input asp-for="Phone" v-model="customer.Phone" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                            <input asp-for="Phone" v-model="customer.Phone" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.Phone.Required"] />
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="Phone"></span>
                                         </validation-provider>
@@ -418,7 +418,7 @@
                                         <validation-provider tag="div" rules="required" name="Fax" v-slot="{ errors, classes }">
                                             <label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>
                                             <span class="required">*</span>
-                                            <input asp-for="Fax" v-model="customer.Fax" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+                                            <input asp-for="Fax" v-model="customer.Fax" v-bind:class="[classes , 'form-control']" autofocus="autofocus" data-val-required=@Loc["Account.Fields.Fax.Required"] />
                                             <span class="field-validation-error">{{ errors[0] }}</span>
                                             <span asp-validation-for="Fax"></span>
                                         </validation-provider>
@@ -470,7 +470,7 @@
                     <div class="form-group">
                         <validation-provider tag="div" vid="customer.Password" rules="required" v-slot="{ errors, classes }">
                             <label asp-for="Password" class="col-form-label">@Loc["Account.Fields.Password"]:</label>
-                            <input asp-for="Password" v-model="customer.Password" v-bind:class="[classes , 'form-control']" autocomplete="off" />
+                            <input asp-for="Password" v-model="customer.Password" v-bind:class="[classes , 'form-control']" autocomplete="off" data-val-required=@Loc["Account.Fields.Password.Required"]/>
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="Password"></span>
                         </validation-provider>
@@ -478,7 +478,7 @@
                     <div class="form-group">
                         <validation-provider tag="div" vid="customer.ConfirmPassword" rules="required|confirmed:@@customer.Password" v-slot="{ errors, classes }">
                             <label asp-for="ConfirmPassword" class="col-form-label">@Loc["Account.Fields.ConfirmPassword"]:</label>
-                            <input asp-for="ConfirmPassword" v-model="customer.ConfirmPassword" v-bind:class="[classes , 'form-control']" autocomplete="off" />
+                            <input asp-for="ConfirmPassword" v-model="customer.ConfirmPassword" v-bind:class="[classes , 'form-control']" autocomplete="off" data-val-equalto=@Loc["Account.Fields.Password.EnteredPasswordsDoNotMatch"] data-val-required=@Loc["Account.Fields.Password.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="ConfirmPassword"></span>
                         </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtml b/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtml
index 4ee9c31f7..bf81df0cf 100644
--- a/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtml
+++ b/src/Web/Grand.Web/Views/Catalog/Components/VendorContact/Default.cshtml
@@ -21,7 +21,7 @@ else
                         <validation-provider tag="div" rules="required" name="FullName" v-slot="{ errors, classes }">
                             <label asp-for="FullName" class="col-form-label">@Loc["ContactVendor.FullName"]:</label>
                             <span class="required">*</span>
-                            <input asp-for="FullName" v-model="contactvendor.FullName" placeholder="@Loc["ContactVendor.FullName.Hint"]" v-bind:class="[classes , 'form-control']" />
+                            <input asp-for="FullName" v-model="contactvendor.FullName" placeholder="@Loc["ContactVendor.FullName.Hint"]" v-bind:class="[classes , 'form-control']"  data-val-required=@Loc["ContactVendor.FullName.Required"]/>
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="FullName"></span>
                         </validation-provider>
@@ -30,7 +30,7 @@ else
                         <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
                             <label asp-for="Email" class="col-form-label">@Loc["ContactVendor.Email"]:</label>
                             <span class="required">*</span>
-                            <input asp-for="Email" v-model="contactvendor.Email" placeholder="@Loc["ContactVendor.Email.Hint"]" v-bind:class="[classes , 'form-control']" />
+                            <input asp-for="Email" v-model="contactvendor.Email" placeholder="@Loc["ContactVendor.Email.Hint"]" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["ContactVendor.Email.Required"] data-val-email=@Loc["Common.WrongEmail"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="Email"></span>
                         </validation-provider>
@@ -41,7 +41,7 @@ else
                             <validation-provider tag="div" rules="required" name="Subject" v-slot="{ errors, classes }">
                                 <label asp-for="Subject" class="col-form-label">@Loc["ContactVendor.Subject"]:</label>
                                 <span class="required">*</span>
-                                <input asp-for="Subject" v-model="contactvendor.Subject" placeholder="@Loc["ContactVendor.Subject.Hint"]" v-bind:class="[classes , 'form-control']" />
+                                <input asp-for="Subject" v-model="contactvendor.Subject" placeholder="@Loc["ContactVendor.Subject.Hint"]" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["ContactVendor.Subject.Required"]/>
                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                 <span asp-validation-for="Subject"></span>
                             </validation-provider>
@@ -51,7 +51,7 @@ else
                         <validation-provider tag="div" rules="required" name="Enquiry" v-slot="{ errors, classes }">
                             <label asp-for="Enquiry" class="col-form-label">@Loc["ContactVendor.Enquiry"]:</label>
                             <span class="required">*</span>
-                            <textarea asp-for="Enquiry" v-model="contactvendor.Enquiry" placeholder="@Loc["ContactVendor.Enquiry.Hint"]" v-bind:class="[classes , 'form-control']" rows="4"></textarea>
+                            <textarea asp-for="Enquiry" v-model="contactvendor.Enquiry" placeholder="@Loc["ContactVendor.Enquiry.Hint"]" v-bind:class="[classes , 'form-control']" rows="4" data-val-required=@Loc["ContactVendor.Enquiry.Required"]></textarea>
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="Enquiry"></span>
                         </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Contact/Index.cshtml b/src/Web/Grand.Web/Views/Contact/Index.cshtml
index c844405ac..ed1a99a9a 100644
--- a/src/Web/Grand.Web/Views/Contact/Index.cshtml
+++ b/src/Web/Grand.Web/Views/Contact/Index.cshtml
@@ -27,7 +27,7 @@
                             <validation-provider tag="div" rules="required" name="FullName" v-slot="{ errors, classes }">
                                 <label asp-for="FullName" class="col-form-label">@Loc["ContactUs.FullName"]:</label>
                                 <span class="required">*</span>
-                                <input asp-for="FullName" v-model="contactus.FullName" placeholder="@Loc["ContactUs.FullName.Hint"]" v-bind:class="[classes , 'form-control']" />
+                                <input asp-for="FullName" v-model="contactus.FullName" placeholder="@Loc["ContactUs.FullName.Hint"]" v-bind:class="[classes , 'form-control']" data-val-required="@Loc["ContactUs.FullName.Required"]" />
                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                 <span asp-validation-for="FullName"></span>
                             </validation-provider>
@@ -36,7 +36,7 @@
                             <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
                                 <label asp-for="Email" class="col-form-label">@Loc["ContactUs.Email"]:</label>
                                 <span class="required">*</span>
-                                <input asp-for="Email" v-model="contactus.Email" placeholder="@Loc["ContactUs.Email.Hint"]" v-bind:class="[classes , 'form-control']" />
+                                <input asp-for="Email" v-model="contactus.Email" placeholder="@Loc["ContactUs.Email.Hint"]" v-bind:class="[classes , 'form-control']" data-val-required="@Loc["ContactUs.Email.Required"]" data-val-email=@Loc["Common.WrongEmail"] />
                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                 <span asp-validation-for="Email"></span>
                             </validation-provider>
@@ -47,7 +47,7 @@
                                 <validation-provider tag="div" rules="required" name="Subject" v-slot="{ errors, classes }">
                                     <label asp-for="Subject" class="col-form-label">@Loc["ContactUs.Subject"]:</label>
                                     <span class="required">*</span>
-                                    <input asp-for="Subject" v-model="contactus.Subject" placeholder="@Loc["ContactUs.Subject.Hint"]" v-bind:class="[classes , 'form-control']" />
+                                    <input asp-for="Subject" v-model="contactus.Subject" placeholder="@Loc["ContactUs.Subject.Hint"]" v-bind:class="[classes , 'form-control']" data-val-required="@Loc["ContactUs.Subject.Required"]"/>
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                     <span asp-validation-for="Subject"></span>
                                 </validation-provider>
@@ -57,7 +57,7 @@
                             <validation-provider tag="div" rules="required" name="Enquiry" v-slot="{ errors, classes }">
                                 <label asp-for="Enquiry" class="col-form-label">@Loc["ContactUs.Enquiry"]:</label>
                                 <span class="required">*</span>
-                                <textarea asp-for="Enquiry" v-model="contactus.Enquiry" placeholder="@Loc["ContactUs.Enquiry.Hint"]" v-bind:class="[classes , 'form-control']" rows="4"></textarea>
+                                <textarea asp-for="Enquiry" v-model="contactus.Enquiry" placeholder="@Loc["ContactUs.Enquiry.Hint"]" v-bind:class="[classes , 'form-control']" rows="4" data-val-required="@Loc["ContactUs.Enquiry.Required"]"></textarea>
                                 <span class="field-validation-error">{{ errors[0] }}</span>
                                 <span asp-validation-for="Enquiry"></span>
                             </validation-provider>
diff --git a/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml b/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml
index 2ef1ea3c5..552d2850a 100644
--- a/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml
+++ b/src/Web/Grand.Web/Views/MerchandiseReturn/MerchandiseReturn.cshtml
@@ -192,7 +192,7 @@
                                 <validation-provider tag="div" rules="required" name="PickupDate" v-slot="{ errors, classes }">
                                     <label class="col-form-label">@Loc["MerchandiseReturns.PickupDate"]:</label>
                                     <span class="required">*</span>
-                                    <input asp-for="PickupDate" type="date" v-model="merchandisereturns.PickupDate" v-bind:class="[classes , 'form-control datepicker']" />
+                                    <input asp-for="PickupDate" type="date" v-model="merchandisereturns.PickupDate" v-bind:class="[classes , 'form-control datepicker']" data-val-required=@Loc["MerchandiseReturns.PickupDateRequired"] />
                                     <span class="field-validation-error">{{ errors[0] }}</span>
                                 </validation-provider>
                             </div>   
diff --git a/src/Web/Grand.Web/Views/Order/Partials/AddOrderNote.cshtml b/src/Web/Grand.Web/Views/Order/Partials/AddOrderNote.cshtml
index 2c4aa3da8..4b6db75af 100644
--- a/src/Web/Grand.Web/Views/Order/Partials/AddOrderNote.cshtml
+++ b/src/Web/Grand.Web/Views/Order/Partials/AddOrderNote.cshtml
@@ -11,7 +11,7 @@
                     <div class="form-group">
                         <validation-provider tag="div" rules="required" name="Note" v-slot="{ errors, classes }">
                             <label asp-for="Note" class="col-form-label">@Loc["OrderNote.Fields.Title"]:</label>
-                            <textarea asp-for="Note" v-model="ordernote.Note" v-bind:class="[classes , 'form-control']" autofocus="autofocus" rows="4"></textarea>
+                            <textarea asp-for="Note" v-model="ordernote.Note" v-bind:class="[classes , 'form-control']" autofocus="autofocus" rows="4" data-val-required="@Loc["OrderNote.Fields.Title.Required"]" ></textarea>
                             <span class="field-validation-error">{{ errors[0] }}</span>
                         </validation-provider>
                     </div>
diff --git a/src/Web/Grand.Web/Views/Product/Components/ProductEmailAFriend/Default.cshtml b/src/Web/Grand.Web/Views/Product/Components/ProductEmailAFriend/Default.cshtml
index 8d3d383c3..788f65e49 100644
--- a/src/Web/Grand.Web/Views/Product/Components/ProductEmailAFriend/Default.cshtml
+++ b/src/Web/Grand.Web/Views/Product/Components/ProductEmailAFriend/Default.cshtml
@@ -30,7 +30,8 @@
                                 <div class="form-group">
                                     <validation-provider tag="div" rules="required|email" name="FriendEmail" v-slot="{ errors, classes }">
                                         <label asp-for="FriendEmail" class="col-form-label">@Loc["Products.EmailAFriend.FriendEmail"]:</label>
-                                        <input asp-for="FriendEmail" v-model="emailafriend.FriendEmail" placeholder="@Loc["Products.EmailAFriend.FriendEmail.Hint"]" v-bind:class="[classes , 'form-control friend-email']" autofocus="autofocus" />
+                                        <input asp-for="FriendEmail" v-model="emailafriend.FriendEmail" placeholder="@Loc["Products.EmailAFriend.FriendEmail.Hint"]" v-bind:class="[classes , 'form-control friend-email']" autofocus="autofocus" 
+                                                data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Products.EmailAFriend.FriendEmail.Required"] />
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="FriendEmail"></span>
                                     </validation-provider>
@@ -38,7 +39,8 @@
                                 <div class="form-group">
                                     <validation-provider tag="div" rules="required|email" name="YourEmailAddress" v-slot="{ errors, classes }">
                                         <label asp-for="YourEmailAddress" class="col-form-label">@Loc["Products.EmailAFriend.YourEmailAddress"]:</label>
-                                        <input asp-for="YourEmailAddress" v-model="emailafriend.YourEmailAddress" placeholder="@Loc["Products.EmailAFriend.YourEmailAddress.Hint"]" v-bind:class="[classes , 'form-control your-email']" autofocus="autofocus" />
+                                        <input asp-for="YourEmailAddress" v-model="emailafriend.YourEmailAddress" placeholder="@Loc["Products.EmailAFriend.YourEmailAddress.Hint"]" v-bind:class="[classes , 'form-control your-email']" autofocus="autofocus" 
+                                                data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Products.EmailAFriend.YourEmailAddress.Required"] />
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="YourEmailAddress"></span>
                                     </validation-provider>
@@ -46,7 +48,7 @@
                                 <div class="form-group">
                                     <validation-provider tag="div" rules="required" name="PersonalMessage" v-slot="{ errors, classes }">
                                         <label asp-for="PersonalMessage" class="col-form-label">@Loc["Products.EmailAFriend.PersonalMessage"]:</label>
-                                        <textarea asp-for="PersonalMessage" v-model="emailafriend.PersonalMessage" placeholder="@Loc["Products.EmailAFriend.PersonalMessage.Hint"]" v-bind:class="[classes , 'form-control your-email']" autofocus="autofocus" rows="4"></textarea>
+                                        <textarea asp-for="PersonalMessage" v-model="emailafriend.PersonalMessage" placeholder="@Loc["Products.EmailAFriend.PersonalMessage.Hint"]" v-bind:class="[classes , 'form-control your-email']" autofocus="autofocus" rows="4" data-val-required=@Loc["Products.EmailAFriend.PersonalMessage.Required"]></textarea>
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="YourEmailAddress"></span>
                                     </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Product/Partials/AskQuestionOnProduct.cshtml b/src/Web/Grand.Web/Views/Product/Partials/AskQuestionOnProduct.cshtml
index d4ada68b3..774bf0406 100644
--- a/src/Web/Grand.Web/Views/Product/Partials/AskQuestionOnProduct.cshtml
+++ b/src/Web/Grand.Web/Views/Product/Partials/AskQuestionOnProduct.cshtml
@@ -5,7 +5,8 @@
         <fieldset class="form-group">
             <validation-provider tag="div" rules="required|email" name="AskQuestionEmail" v-slot="{ errors, classes }">
                 <label asp-for="AskQuestionEmail" class="col-form-label">@Loc["Products.AskQuestion.Email"]:</label>
-                <input asp-for="AskQuestionEmail" ref="AskQuestionEmail" v-model="askquestion.AskQuestionEmail" placeholder="@Loc["Products.AskQuestion.Email.Hint"]" v-bind:class="[classes , 'form-control ask-question-email']"/>
+                <input asp-for="AskQuestionEmail" ref="AskQuestionEmail" v-model="askquestion.AskQuestionEmail" placeholder="@Loc["Products.AskQuestion.Email.Hint"]" v-bind:class="[classes , 'form-control ask-question-email']"
+                       data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Products.AskQuestion.Email.Required"] />
                 <span class="field-validation-error">{{ errors[0] }}</span>
                 <span asp-validation-for="AskQuestionEmail"></span>
             </validation-provider>
@@ -13,7 +14,8 @@
         <fieldset class="form-group">
             <validation-provider tag="div" rules="required" name="AskQuestionFullName" v-slot="{ errors, classes }">
                 <label asp-for="AskQuestionFullName" class="col-form-label">@Loc["Products.AskQuestion.FullName"]:</label>
-                <input asp-for="AskQuestionFullName" ref="AskQuestionFullName" v-model="askquestion.AskQuestionFullName" placeholder="@Loc["Products.AskQuestion.FullName.Hint"]" v-bind:class="[classes , 'form-control ask-question-fullname']"/>
+                <input asp-for="AskQuestionFullName" ref="AskQuestionFullName" v-model="askquestion.AskQuestionFullName" placeholder="@Loc["Products.AskQuestion.FullName.Hint"]" v-bind:class="[classes , 'form-control ask-question-fullname']"
+                       data-val-required=@Loc["Products.AskQuestion.FullName.Required"] />
                 <span class="field-validation-error">{{ errors[0] }}</span>
                 <span asp-validation-for="AskQuestionFullName"></span>
             </validation-provider>
@@ -25,7 +27,7 @@
         <fieldset class="form-group">
             <validation-provider tag="div" rules="required" name="AskQuestionMessage" v-slot="{ errors, classes }">
                 <label asp-for="AskQuestionMessage" class="col-form-label">@Loc["Products.AskQuestion.Message"]:</label>
-                <textarea asp-for="AskQuestionMessage" ref="AskQuestionMessage" v-model="askquestion.AskQuestionMessage" placeholder="@Loc["Products.AskQuestion.Message.Hint"]" v-bind:class="[classes , 'form-control ask-question-message']" rows="4"></textarea>
+                <textarea asp-for="AskQuestionMessage" ref="AskQuestionMessage" v-model="askquestion.AskQuestionMessage" placeholder="@Loc["Products.AskQuestion.Message.Hint"]" v-bind:class="[classes , 'form-control ask-question-message']" rows="4" data-val-required=@Loc["Products.AskQuestion.Message.Required"] ></textarea>
                 <span class="field-validation-error">{{ errors[0] }}</span>
                 <span asp-validation-for="AskQuestionMessage"></span>
             </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml b/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml
index c252ad338..8ba56242d 100644
--- a/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Shared/Partials/CreateOrUpdateAddress.cshtml
@@ -53,7 +53,7 @@
         <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
             <label asp-for="FirstName" class="col-form-label">@Loc["Address.Fields.FirstName"]:</label>
             <span class="required">*</span>
-            <input asp-for="FirstName" v-model="createorupdateaddress@{@prefix}.FirstName" v-bind:class="[classes , 'form-control']" />
+            <input asp-for="FirstName" v-model="createorupdateaddress@{@prefix}.FirstName" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.FirstName.Required"] />
             <span class="field-validation-error">{{ errors[0] }}</span>
         </validation-provider>
     </div>
@@ -61,7 +61,7 @@
         <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
             <label asp-for="LastName" class="col-form-label">@Loc["Address.Fields.LastName"]:</label>
             <span class="required">*</span>
-            <input asp-for="LastName" v-model="createorupdateaddress@{@prefix}.LastName" v-bind:class="[classes , 'form-control']" />
+            <input asp-for="LastName" v-model="createorupdateaddress@{@prefix}.LastName" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.LastName.Required"] />
             <span class="field-validation-error">{{ errors[0] }}</span>
         </validation-provider>
     </div>
@@ -69,7 +69,7 @@
         <validation-provider tag="div" rules="required|email" v-slot="{ errors, classes }">
             <label asp-for="Email" class="col-form-label">@Loc["Address.Fields.Email"]:</label>
             <span class="required">*</span>
-            <input asp-for="Email" v-model="createorupdateaddress@{@prefix}.Email" v-bind:class="[classes , 'form-control']" asp-readonly=@(Model.DisallowUsersToChangeEmail) />
+            <input asp-for="Email" v-model="createorupdateaddress@{@prefix}.Email" v-bind:class="[classes , 'form-control']" asp-readonly=@(Model.DisallowUsersToChangeEmail) data-val-required=@Loc["Address.Fields.Email.Required"] data-val-email=@Loc["Common.WrongEmail"] />
             <span class="field-validation-error">{{ errors[0] }}</span>
         </validation-provider>
     </div>
@@ -81,7 +81,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="Company" class="col-form-label">@Loc["Address.Fields.Company"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="Company" v-model="createorupdateaddress@{@prefix}.Company" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="Company" v-model="createorupdateaddress@{@prefix}.Company" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.Company.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
@@ -100,7 +100,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="VatNumber" class="col-form-label">@Loc["Address.Fields.VatNumber"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="VatNumber" v-model="createorupdateaddress@{@prefix}.VatNumber" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="VatNumber" v-model="createorupdateaddress@{@prefix}.VatNumber" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.Fields.VatNumber.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
@@ -117,7 +117,7 @@
             <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                 <label asp-for="CountryId" class="col-form-label">@Loc["Address.Fields.Country"]:</label>
                 <span class="required">*</span>
-                <select asp-for="CountryId" asp-items="Model.AvailableCountries"
+                <select asp-for="CountryId" asp-items="Model.AvailableCountries" data-val-required=@Loc["Address.Fields.Country.Required"] 
                         onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="createorupdateaddress@{@prefix}.CountryId"></select>
                 <span class="field-validation-error">{{ errors[0] }}</span>
             </validation-provider>
@@ -144,7 +144,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="City" class="col-form-label">@Loc["Address.Fields.City"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="City" v-model="createorupdateaddress@{@prefix}.City" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="City" v-model="createorupdateaddress@{@prefix}.City" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.City.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
@@ -164,7 +164,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="Address1" class="col-form-label">@Loc["Address.Fields.Address1"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="Address1" v-model="createorupdateaddress@{@prefix}.Address1" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="Address1" v-model="createorupdateaddress@{@prefix}.Address1" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.Address1.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
@@ -183,7 +183,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="Address2" class="col-form-label">@Loc["Address.Fields.Address2"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="Address2" v-model="createorupdateaddress@{@prefix}.Address2" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="Address2" v-model="createorupdateaddress@{@prefix}.Address2" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.Address2.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
@@ -202,7 +202,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Address.Fields.ZipPostalCode"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="ZipPostalCode" v-model="createorupdateaddress@{@prefix}.ZipPostalCode" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="ZipPostalCode" v-model="createorupdateaddress@{@prefix}.ZipPostalCode" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.ZipPostalCode.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
@@ -221,7 +221,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="PhoneNumber" class="col-form-label">@Loc["Address.Fields.PhoneNumber"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="PhoneNumber" v-model="createorupdateaddress@{@prefix}.PhoneNumber" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="PhoneNumber" v-model="createorupdateaddress@{@prefix}.PhoneNumber" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.PhoneNumber.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
@@ -240,7 +240,7 @@
                 <validation-provider tag="div" rules="required" v-slot="{ errors, classes }">
                     <label asp-for="FaxNumber" class="col-form-label">@Loc["Address.Fields.FaxNumber"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="FaxNumber" v-model="createorupdateaddress@{@prefix}.FaxNumber" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="FaxNumber" v-model="createorupdateaddress@{@prefix}.FaxNumber" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Address.Fields.FaxNumber.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                 </validation-provider>
             }
diff --git a/src/Web/Grand.Web/Views/Vendor/ApplyVendor.cshtml b/src/Web/Grand.Web/Views/Vendor/ApplyVendor.cshtml
index 05b51f1d9..cf5f99ded 100644
--- a/src/Web/Grand.Web/Views/Vendor/ApplyVendor.cshtml
+++ b/src/Web/Grand.Web/Views/Vendor/ApplyVendor.cshtml
@@ -27,7 +27,8 @@
                         <validation-provider tag="div" rules="required" name="Name" v-slot="{ errors, classes }">
                             <label asp-for="Name" class="col-form-label">@Loc["Vendors.ApplyAccount.Name"]:</label>
                             <span class="required">*</span>
-                            <input asp-for="Name" v-model="applyvendor.Name" placeholder="@Loc["Vendors.ApplyAccount.Name.Hint"]" v-bind:class="[classes , 'form-control']" />
+                            <input asp-for="Name" v-model="applyvendor.Name" placeholder="@Loc["Vendors.ApplyAccount.Name.Hint"]" v-bind:class="[classes , 'form-control']" 
+                                    data-val-required=@Loc["Vendors.ApplyAccount.Name.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="Name"></span>
                         </validation-provider>
@@ -36,7 +37,8 @@
                         <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
                             <label asp-for="Email" class="col-form-label">@Loc["Vendors.ApplyAccount.Email"]:</label>
                             <span class="required">*</span>
-                            <input asp-for="Email" v-model="applyvendor.Email" placeholder="@Loc["Vendors.ApplyAccount.Email.Hint"]" v-bind:class="[classes , 'form-control']" />
+                            <input asp-for="Email" v-model="applyvendor.Email" placeholder="@Loc["Vendors.ApplyAccount.Email.Hint"]" v-bind:class="[classes , 'form-control']" 
+                                   data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.ApplyAccount.Email.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="Email"></span>
                         </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Vendor/Info.cshtml b/src/Web/Grand.Web/Views/Vendor/Info.cshtml
index b5c8d4ef2..577637ce1 100644
--- a/src/Web/Grand.Web/Views/Vendor/Info.cshtml
+++ b/src/Web/Grand.Web/Views/Vendor/Info.cshtml
@@ -20,7 +20,7 @@
                     <validation-provider tag="div" rules="required" name="Name" v-slot="{ errors, classes }">
                         <label asp-for="Name" class="col-form-label">@Loc["Account.VendorInfo.Name"]:</label>
                         <span class="required">*</span>
-                        <input asp-for="Name" v-model="vendorinfo.Name" placeholder="@Loc["Account.VendorInfo.Name.Hint"]" v-bind:class="[classes , 'form-control']" />
+                        <input asp-for="Name" v-model="vendorinfo.Name" placeholder="@Loc["Account.VendorInfo.Name.Hint"]" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.Name.Required"] />
                         <span class="field-validation-error">{{ errors[0] }}</span>
                         <span asp-validation-for="Name"></span>
                     </validation-provider>
@@ -29,7 +29,8 @@
                     <validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
                         <label asp-for="Email" class="col-form-label">@Loc["Account.VendorInfo.Email"]:</label>
                         <span class="required">*</span>
-                        <input asp-for="Email" v-model="vendorinfo.Email" placeholder="@Loc["Account.VendorInfo.Email.Hint"]" v-bind:class="[classes , 'form-control']" />
+                        <input asp-for="Email" v-model="vendorinfo.Email" placeholder="@Loc["Account.VendorInfo.Email.Hint"]" v-bind:class="[classes , 'form-control']" 
+                               data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Account.VendorInfo.Email.Required"] />
                         <span class="field-validation-error">{{ errors[0] }}</span>
                         <span asp-validation-for="Email"></span>
                     </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Vendor/Partials/CreateOrUpdateVendorAddress.cshtml b/src/Web/Grand.Web/Views/Vendor/Partials/CreateOrUpdateVendorAddress.cshtml
index eb19293b6..aebc0c2eb 100644
--- a/src/Web/Grand.Web/Views/Vendor/Partials/CreateOrUpdateVendorAddress.cshtml
+++ b/src/Web/Grand.Web/Views/Vendor/Partials/CreateOrUpdateVendorAddress.cshtml
@@ -50,7 +50,7 @@
                 <validation-provider tag="div" rules="required" :name="'@prefix'  + '.Company'" v-slot="{ errors, classes }">
                     <label asp-for="Company" class="col-form-label">@Loc["Address.Fields.Company"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="Company" v-model="createorupdatevendoraddress.Company" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="Company" v-model="createorupdatevendoraddress.Company" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.Company.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                     <span asp-validation-for="Company"></span>
                 </validation-provider>
@@ -69,7 +69,7 @@
             <validation-provider tag="div" rules="required" :name="'@prefix' + '.CountryId'" v-slot="{ errors, classes }">
                 <label asp-for="CountryId" class="col-form-label">@Loc["Address.Fields.Country"]:</label>
                 <span class="required">*</span>
-                <select asp-for="CountryId" asp-items="Model.AvailableCountries"
+                <select asp-for="CountryId" asp-items="Model.AvailableCountries" data-val-required=@Loc["Account.VendorInfo.Country.Required"] 
                         onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="createorupdatevendoraddress.CountryId"></select>
                 <span class="field-validation-error">{{ errors[0] }}</span>
                 <span asp-validation-for="CountryId"></span>
@@ -99,7 +99,7 @@
                 <validation-provider tag="div" rules="required" :name="'@prefix' + '.City'" v-slot="{ errors, classes }">
                     <label asp-for="City" class="col-form-label">@Loc["Address.Fields.City"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="City" v-model="createorupdatevendoraddress.City" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="City" v-model="createorupdatevendoraddress.City" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.City.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                     <span asp-validation-for="City"></span>
                 </validation-provider>
@@ -120,7 +120,7 @@
                 <validation-provider tag="div" rules="required" :name="'@prefix' + '.Address1'" v-slot="{ errors, classes }">
                     <label asp-for="Address1" class="col-form-label">@Loc["Address.Fields.Address1"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="Address1" v-model="createorupdatevendoraddress.Address1" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="Address1" v-model="createorupdatevendoraddress.Address1" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.Address1.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                     <span asp-validation-for="Address1"></span>
                 </validation-provider>
@@ -141,7 +141,7 @@
                 <validation-provider tag="div" rules="required" :name="'@prefix' + '.Address2'" v-slot="{ errors, classes }">
                     <label asp-for="Address2" class="col-form-label">@Loc["Address.Fields.Address2"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="Address2" v-model="createorupdatevendoraddress.Address2" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="Address2" v-model="createorupdatevendoraddress.Address2" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.Address2.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                     <span asp-validation-for="Address2"></span>
                 </validation-provider>
@@ -162,7 +162,7 @@
                 <validation-provider tag="div" rules="required" :name="'@prefix' + '.ZipPostalCode'" v-slot="{ errors, classes }">
                     <label asp-for="ZipPostalCode" class="col-form-label">@Loc["Address.Fields.ZipPostalCode"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="ZipPostalCode" v-model="createorupdatevendoraddress.ZipPostalCode" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="ZipPostalCode" v-model="createorupdatevendoraddress.ZipPostalCode" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.ZipPostalCode.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                     <span asp-validation-for="ZipPostalCode"></span>
                 </validation-provider>
@@ -183,7 +183,7 @@
                 <validation-provider tag="div" rules="required" :name="'@prefix' + '.PhoneNumber'" v-slot="{ errors, classes }">
                     <label asp-for="PhoneNumber" class="col-form-label">@Loc["Address.Fields.PhoneNumber"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="PhoneNumber" v-model="createorupdatevendoraddress.PhoneNumber" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="PhoneNumber" v-model="createorupdatevendoraddress.PhoneNumber" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.PhoneNumber.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                     <span asp-validation-for="PhoneNumber"></span>
                 </validation-provider>
@@ -204,7 +204,7 @@
                 <validation-provider tag="div" rules="required" :name="'@prefix' + '.FaxNumber'" v-slot="{ errors, classes }">
                     <label asp-for="FaxNumber" class="col-form-label">@Loc["Address.Fields.FaxNumber"]:</label>
                     <span class="required">*</span>
-                    <input asp-for="FaxNumber" v-model="createorupdatevendoraddress.FaxNumber" v-bind:class="[classes , 'form-control']" />
+                    <input asp-for="FaxNumber" v-model="createorupdatevendoraddress.FaxNumber" v-bind:class="[classes , 'form-control']" data-val-required=@Loc["Account.VendorInfo.FaxNumber.Required"] />
                     <span class="field-validation-error">{{ errors[0] }}</span>
                     <span asp-validation-for="FaxNumber"></span>
                 </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Wishlist/Components/EmailWishlist/Default.cshtml b/src/Web/Grand.Web/Views/Wishlist/Components/EmailWishlist/Default.cshtml
index 479d67031..9896c2e83 100644
--- a/src/Web/Grand.Web/Views/Wishlist/Components/EmailWishlist/Default.cshtml
+++ b/src/Web/Grand.Web/Views/Wishlist/Components/EmailWishlist/Default.cshtml
@@ -35,7 +35,8 @@
                                     <validation-provider tag="div" rules="required|email" name="FriendEmail" v-slot="{ errors, classes }">
                                         <label asp-for="FriendEmail" class="col-form-label">@Loc["Wishlist.EmailAFriend.FriendEmail"]:</label>
                                         <span class="required">*</span>
-                                        <input asp-for="FriendEmail" v-model="emailwishlist.FriendEmail" placeholder="@Loc["Wishlist.EmailAFriend.FriendEmail.Hint"]" v-bind:class="[classes , 'form-control']" />
+                                        <input asp-for="FriendEmail" v-model="emailwishlist.FriendEmail" placeholder="@Loc["Wishlist.EmailAFriend.FriendEmail.Hint"]" v-bind:class="[classes , 'form-control']" 
+                                               data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Wishlist.EmailAFriend.YourEmailAddress.Required"] />
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="FriendEmail"></span>
                                     </validation-provider>
@@ -44,7 +45,8 @@
                                     <validation-provider tag="div" rules="required|email" name="YourEmailAddress" v-slot="{ errors, classes }">
                                         <label asp-for="YourEmailAddress" class="col-form-label">@Loc["Wishlist.EmailAFriend.YourEmailAddress"]:</label>
                                         <span class="required">*</span>
-                                        <input asp-for="YourEmailAddress" v-model="emailwishlist.YourEmailAddress" placeholder="@Loc["Wishlist.EmailAFriend.YourEmailAddress.Hint"]" v-bind:class="[classes , 'form-control']" />
+                                        <input asp-for="YourEmailAddress" v-model="emailwishlist.YourEmailAddress" placeholder="@Loc["Wishlist.EmailAFriend.YourEmailAddress.Hint"]" v-bind:class="[classes , 'form-control']" 
+                                               data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Wishlist.EmailAFriend.YourEmailAddress.Required"] />
                                         <span class="field-validation-error">{{ errors[0] }}</span>
                                         <span asp-validation-for="YourEmailAddress"></span>
                                     </validation-provider>
diff --git a/src/Web/Grand.Web/Views/Wishlist/EmailWishlist.cshtml b/src/Web/Grand.Web/Views/Wishlist/EmailWishlist.cshtml
index 943ff5c93..8f9b80eb8 100644
--- a/src/Web/Grand.Web/Views/Wishlist/EmailWishlist.cshtml
+++ b/src/Web/Grand.Web/Views/Wishlist/EmailWishlist.cshtml
@@ -24,7 +24,8 @@
                         <validation-provider tag="div" rules="required|email" name="FriendEmail" v-slot="{ errors, classes }">
                             <label asp-for="FriendEmail" class="col-form-label">@Loc["Wishlist.EmailAFriend.FriendEmail"]:</label>
                             <span class="required">*</span>
-                            <input asp-for="FriendEmail" v-model="emailwishlist.FriendEmail" placeholder="@Loc["Wishlist.EmailAFriend.FriendEmail.Hint"]" v-bind:class="[classes , 'form-control']" />
+                            <input asp-for="FriendEmail" v-model="emailwishlist.FriendEmail" placeholder="@Loc["Wishlist.EmailAFriend.FriendEmail.Hint"]" v-bind:class="[classes , 'form-control']" 
+                                   data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Wishlist.EmailAFriend.FriendEmail.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="FriendEmail"></span>
                         </validation-provider>
@@ -33,7 +34,8 @@
                         <validation-provider tag="div" rules="required|email" name="YourEmailAddress" v-slot="{ errors, classes }">
                             <label asp-for="YourEmailAddress" class="col-form-label">@Loc["Wishlist.EmailAFriend.YourEmailAddress"]:</label>
                             <span class="required">*</span>
-                            <input asp-for="YourEmailAddress" v-model="emailwishlist.YourEmailAddress" placeholder="@Loc["Wishlist.EmailAFriend.YourEmailAddress.Hint"]" v-bind:class="[classes , 'form-control']" />
+                            <input asp-for="YourEmailAddress" v-model="emailwishlist.YourEmailAddress" placeholder="@Loc["Wishlist.EmailAFriend.YourEmailAddress.Hint"]" v-bind:class="[classes , 'form-control']" 
+                                   data-val-email=@Loc["Common.WrongEmail"] data-val-required=@Loc["Wishlist.EmailAFriend.YourEmailAddress.Required"] />
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="YourEmailAddress"></span>
                         </validation-provider>
@@ -42,7 +44,7 @@
                         <validation-provider tag="div" rules="required" name="PersonalMessage" v-slot="{ errors, classes }">
                             <label asp-for="PersonalMessage" class="col-form-label">@Loc["Wishlist.EmailAFriend.PersonalMessage"]:</label>
                             <span class="required">*</span>
-                            <textarea asp-for="PersonalMessage" v-model="emailwishlist.PersonalMessage" placeholder="@Loc["Wishlist.EmailAFriend.PersonalMessage.Hint"]" v-bind:class="[classes , 'form-control']" rows="4"></textarea>
+                            <textarea asp-for="PersonalMessage" v-model="emailwishlist.PersonalMessage" placeholder="@Loc["Wishlist.EmailAFriend.PersonalMessage.Hint"]" v-bind:class="[classes , 'form-control']" rows="4" data-val-required=@Loc["Wishlist.EmailAFriend.PersonalMessage.Required"] ></textarea>
                             <span class="field-validation-error">{{ errors[0] }}</span>
                             <span asp-validation-for="PersonalMessage"></span>
                         </validation-provider>