Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Razor Views - change asp-validation-summary=ModelOnly to asp-validation-summary="All"
support5fc4ba567dea
diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/ChangePassword.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/ChangePassword.cshtmlindex c7acfd700..bcbfb0a10 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Account/ChangePassword.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/ChangePassword.cshtml@@ -31,7 +31,7 @@@Model.Result</section>}- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div><fieldset><div class="form-fields">diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/DeleteAccount.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/DeleteAccount.cshtmlindex 8fc933254..c273944fb 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Account/DeleteAccount.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/DeleteAccount.cshtml@@ -25,7 +25,7 @@@Loc["Account.Navigation"]</div></a>- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div><div class="alert alert-danger" role="alert">@Loc["Account.DeleteAccount.DangerAlert"]</div>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Info.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Info.cshtmlindex b4f012c9f..4692f0431 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Account/Info.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Info.cshtml@@ -91,7 +91,7 @@</a><validation-observer v-slot="{ handleSubmit }"><form asp-route="CustomerInfo" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)">- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div><div class="card mb-3"><h3 class="card-header">@Loc["Account.YourPersonalDetails"]</h3><div class="card-body">diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtmlindex 7a0519170..d502e795a 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/Login.cshtml@@ -24,7 +24,7 @@</h3></div><div class="card-body">- <div asp-validation-summary="ModelOnly" class="message-error w-100 alert alert-danger pb-0 text-center">@Loc["Account.Login.Unsuccessful"]</div>+ <div asp-validation-summary="All" class="message-error w-100 text-center"></div><div class="col-12 form-group mb-0">@if (Model.UsernamesEnabled){diff --git a/src/Plugins/Theme.Modern/Views/Modern/Account/PasswordRecovery.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Account/PasswordRecovery.cshtmlindex 87a6280bc..82ffbd213 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Account/PasswordRecovery.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Account/PasswordRecovery.cshtml@@ -20,7 +20,7 @@<validation-observer v-slot="{ handleSubmit }"><form asp-route="PasswordRecovery" method="post" ref="form" v-on:submit.prevent="handleSubmit(formSubmit)"><input type="hidden" asp-for="DisplayCaptcha" />- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div><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>diff --git a/src/Plugins/Theme.Modern/Views/Modern/Blog/BlogPost.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Blog/BlogPost.cshtmlindex a99ce4cd8..02460804d 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Blog/BlogPost.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Blog/BlogPost.cshtml@@ -73,7 +73,7 @@<div class="fieldset new-comment generalMarginSupporter d-flex flex-column w-100" id="comments"><h4 class="generalTitle generalMarginSupporter">@Loc["Blog.Comments.LeaveYourComment"]</h4><div class="notifications">- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div>@{var result = TempData["Grand.blog.addcomment.result"] as string;}diff --git a/src/Plugins/Theme.Modern/Views/Modern/News/NewsItem.cshtml b/src/Plugins/Theme.Modern/Views/Modern/News/NewsItem.cshtmlindex 9f4d60ee1..d8fdc7b3d 100644--- a/src/Plugins/Theme.Modern/Views/Modern/News/NewsItem.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/News/NewsItem.cshtml@@ -43,7 +43,7 @@<fieldset class="new-comment py-3 px-0" id="comments"><h5><strong>@Loc["News.Comments.LeaveYourComment"]</strong></h5><div class="notifications">- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div>@{var result = TempData["Grand.news.addcomment.result"] as string;}diff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Partials/ProductReview.Modal.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Partials/ProductReview.Modal.cshtmlindex 1b7a7e196..c27de193f 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Partials/ProductReview.Modal.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/Components/ProductReviews/Partials/ProductReview.Modal.cshtml@@ -15,7 +15,7 @@<form id="addReviewForm" asp-route="ProductReviews" asp-route-ProductId="@Model.ProductId" method="post" ref="modalForm"v-on:submit.prevent="handleSubmit(productreviews.submitProductReview)" :data-title="'@Loc["Reviews.ProductReviewsFor"] ' + productreviews.Model.ProductName"><input type="hidden" asp-for="@Model.ProductId" />- <div asp-validation-summary="ModelOnly" class="message-error alert alert-danger my-3"></div>+ <div asp-validation-summary="All" class="message-error my-3"></div><fieldset><div class="form-fields"><div class="form-group">diff --git a/src/Plugins/Theme.Modern/Views/Modern/Product/ProductEmailAFriend.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductEmailAFriend.cshtmlindex aba2bf725..84d15079c 100644--- a/src/Plugins/Theme.Modern/Views/Modern/Product/ProductEmailAFriend.cshtml+++ b/src/Plugins/Theme.Modern/Views/Modern/Product/ProductEmailAFriend.cshtml@@ -20,7 +20,7 @@else{<form asp-route="ProductEmailAFriend" method="post" v-on:submit.prevent="validateBeforeSubmit($event)">- <div asp-validation-summary="ModelOnly" class="message-error"></div>+ <div asp-validation-summary="All" class="message-error"></div><div class="form-fields"><div class="form-group"><label asp-for="FriendEmail" class="col-form-label">@Loc["Products.EmailAFriend.FriendEmail"]:</label>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/Index.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/Index.cshtmlindex c39b96891..7162ef6b2 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/Index.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/Index.cshtml@@ -9,7 +9,7 @@<h5 class="card-header"><strong>@Loc["Admin.Login.Title"]</strong></h5><div class="card-body"><div class="row">- <div asp-validation-summary="ModelOnly" class="message-error w-100 text-center">@Loc["Admin.Login.Unsuccessful"]</div>+ <div asp-validation-summary="All" class="message-error text-center"></div><div class="col-12 form-group mb-0">@if (Model.UsernamesEnabled){diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/TwoFactorAuthorization.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/TwoFactorAuthorization.cshtmlindex 1ee640817..bb306f4d6 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/TwoFactorAuthorization.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Login/TwoFactorAuthorization.cshtml@@ -10,7 +10,7 @@<h5 class="card-header"><strong>@Loc["Admin.Login.TwoFactorAuth.EnterCode"]</strong></h5><div class="card-body"><div class="row">- <div asp-validation-summary="ModelOnly" class="col-12 justify-content-around text-danger"></div>+ <div asp-validation-summary="All" class="col-12 justify-content-around text-danger"></div><div class="col-12 form-group mb-0 d-flex justify-content-around"><div class="form-group row"><div class="col-lg-3 col-12 d-flex align-items-start justify-content-sm-start">diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/Index.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/Index.cshtmlindex af0968fa3..94fad1d60 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/Index.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/Index.cshtml@@ -9,7 +9,7 @@<h5 class="card-header"><strong>@Loc["Vendor.Login.Title"]</strong></h5><div class="card-body"><div class="row">- <div asp-validation-summary="ModelOnly" class="message-error w-100 text-center">@Loc["Vendor.Login.Unsuccessful"]</div>+ <div asp-validation-summary="All" class="message-error text-center"></div><div class="col-12 form-group mb-0">@if (Model.UsernamesEnabled){diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/TwoFactorAuthorization.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/TwoFactorAuthorization.cshtmlindex 79c7089b7..2b5a825ec 100644--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/TwoFactorAuthorization.cshtml+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Login/TwoFactorAuthorization.cshtml@@ -10,7 +10,7 @@<h5 class="card-header"><strong>@Loc["Vendor.Login.TwoFactor.EnterCode"]</strong></h5><div class="card-body"><div class="row">- <div asp-validation-summary="ModelOnly" class="col-12 justify-content-around text-danger"></div>+ <div asp-validation-summary="All" class="col-12 justify-content-around text-danger"></div><div class="col-12 form-group mb-0 d-flex justify-content-around"><div class="form-group row"><div class="col-lg-3 col-12 d-flex align-items-start justify-content-sm-start">diff --git a/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.cs b/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.csindex 5285b2d48..851b986b5 100644--- a/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.cs+++ b/src/Web/Grand.Web/Models/Customer/CustomerInfoModel.cs@@ -1,6 +1,7 @@using Grand.Domain.Customers;using Grand.Infrastructure.ModelBinding;using Grand.Infrastructure.Models;+using Grand.SharedKernel;using Grand.Web.Common.Binders;using Grand.Web.Common.Models;using Grand.Web.Models.Newsletter;@@ -22,6 +23,7 @@ namespace Grand.Web.Models.CustomerNewsletterCategories = new List<NewsletterSimpleCategory>();}+ [MaxLength(FieldSizeLimits.EmailMaxLength)][DataType(DataType.EmailAddress)][GrandResourceDisplayName("Account.Fields.Email")]public string Email { get; set; }@@ -30,6 +32,8 @@ namespace Grand.Web.Models.Customerpublic bool CheckUsernameAvailabilityEnabled { get; set; }public bool AllowUsersToChangeUsernames { get; set; }public bool UsernamesEnabled { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.Username")]public string Username { get; set; }@@ -38,8 +42,11 @@ namespace Grand.Web.Models.Customer[GrandResourceDisplayName("Account.Fields.Gender")]public string Gender { get; set; }+ [StringLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.FirstName")]public string FirstName { get; set; }++ [StringLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.LastName")]public string LastName { get; set; }public bool FirstLastNameRequired { get; set; }@@ -67,31 +74,42 @@ namespace Grand.Web.Models.Customerpublic bool CompanyEnabled { get; set; }public bool CompanyRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.Company")]public string Company { get; set; }public bool StreetAddressEnabled { get; set; }public bool StreetAddressRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.StreetAddress")]public string StreetAddress { get; set; }public bool StreetAddress2Enabled { get; set; }public bool StreetAddress2Required { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.StreetAddress2")]public string StreetAddress2 { get; set; }public bool ZipPostalCodeEnabled { get; set; }public bool ZipPostalCodeRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.ZipPostalCode")]public string ZipPostalCode { get; set; }public bool CityEnabled { get; set; }public bool CityRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.City")]public string City { get; set; }public bool CountryEnabled { get; set; }public bool CountryRequired { get; set; }+[GrandResourceDisplayName("Account.Fields.Country")]public string CountryId { get; set; }public IList<SelectListItem> AvailableCountries { get; set; }@@ -104,6 +122,8 @@ namespace Grand.Web.Models.Customerpublic bool PhoneEnabled { get; set; }public bool PhoneRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][DataType(DataType.PhoneNumber)][GrandResourceDisplayName("Account.Fields.Phone")]public string Phone { get; set; }@@ -111,6 +131,7 @@ namespace Grand.Web.Models.Customerpublic bool FaxEnabled { get; set; }public bool FaxRequired { get; set; }+ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.Fax")]public string Fax { get; set; }@@ -123,6 +144,7 @@ namespace Grand.Web.Models.Customerpublic bool Is2faEnabled { get; set; }//EU VAT+ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.VatNumber")]public string VatNumber { get; set; }public string VatNumberStatusNote { get; set; }diff --git a/src/Web/Grand.Web/Models/Customer/LoginModel.cs b/src/Web/Grand.Web/Models/Customer/LoginModel.csindex 216965068..823dd4d92 100644--- a/src/Web/Grand.Web/Models/Customer/LoginModel.cs+++ b/src/Web/Grand.Web/Models/Customer/LoginModel.cs@@ -1,5 +1,6 @@using Grand.Infrastructure.ModelBinding;using Grand.Infrastructure.Models;+using Grand.SharedKernel;using System.ComponentModel.DataAnnotations;namespace Grand.Web.Models.Customer@@ -12,11 +13,13 @@ namespace Grand.Web.Models.Customer}public bool CheckoutAsGuest { get; set; }+ [MaxLength(FieldSizeLimits.EmailMaxLength)][DataType(DataType.EmailAddress)][GrandResourceDisplayName("Account.Login.Fields.Email")]public string Email { get; set; }public bool UsernamesEnabled { get; set; }+ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Login.Fields.UserName")]public string Username { get; set; }diff --git a/src/Web/Grand.Web/Models/Customer/RegisterModel.cs b/src/Web/Grand.Web/Models/Customer/RegisterModel.csindex e316191de..05c4d891a 100644--- a/src/Web/Grand.Web/Models/Customer/RegisterModel.cs+++ b/src/Web/Grand.Web/Models/Customer/RegisterModel.cs@@ -1,5 +1,6 @@using Grand.Infrastructure.ModelBinding;using Grand.Infrastructure.Models;+using Grand.SharedKernel;using Grand.Web.Common.Binders;using Grand.Web.Common.Models;using Grand.Web.Models.Newsletter;@@ -20,11 +21,14 @@ namespace Grand.Web.Models.CustomerNewsletterCategories = new List<NewsletterSimpleCategory>();Captcha = new CaptchaModel();}+ [MaxLength(FieldSizeLimits.EmailMaxLength)][DataType(DataType.EmailAddress)][GrandResourceDisplayName("Account.Fields.Email")]public string Email { get; set; }public bool UsernamesEnabled { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.Username")]public string Username { get; set; }@@ -43,9 +47,11 @@ namespace Grand.Web.Models.Customer[GrandResourceDisplayName("Account.Fields.Gender")]public string Gender { get; set; }+ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.FirstName")]public string FirstName { get; set; }+ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.LastName")]public string LastName { get; set; }@@ -75,31 +81,42 @@ namespace Grand.Web.Models.Customerpublic bool CompanyEnabled { get; set; }public bool CompanyRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.Company")]public string Company { get; set; }public bool StreetAddressEnabled { get; set; }public bool StreetAddressRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.StreetAddress")]public string StreetAddress { get; set; }public bool StreetAddress2Enabled { get; set; }public bool StreetAddress2Required { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.StreetAddress2")]public string StreetAddress2 { get; set; }public bool ZipPostalCodeEnabled { get; set; }public bool ZipPostalCodeRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.ZipPostalCode")]public string ZipPostalCode { get; set; }public bool CityEnabled { get; set; }public bool CityRequired { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.City")]public string City { get; set; }public bool CountryEnabled { get; set; }public bool CountryRequired { get; set; }+[GrandResourceDisplayName("Account.Fields.Country")]public string CountryId { get; set; }public IList<SelectListItem> AvailableCountries { get; set; }@@ -112,6 +129,7 @@ namespace Grand.Web.Models.Customerpublic bool PhoneEnabled { get; set; }public bool PhoneRequired { get; set; }+ [MaxLength(FieldSizeLimits.NameMaxLength)][DataType(DataType.PhoneNumber)][GrandResourceDisplayName("Account.Fields.Phone")]public string Phone { get; set; }@@ -119,6 +137,7 @@ namespace Grand.Web.Models.Customerpublic bool FaxEnabled { get; set; }public bool FaxRequired { get; set; }+ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.Fax")]public string Fax { get; set; }@@ -129,6 +148,7 @@ namespace Grand.Web.Models.Customerpublic bool AcceptPrivacyPolicyEnabled { get; set; }//EU VAT+ [MaxLength(FieldSizeLimits.NameMaxLength)][GrandResourceDisplayName("Account.Fields.VatNumber")]public string VatNumber { get; set; }public bool DisplayVatNumber { get; set; }diff --git a/src/Web/Grand.Web/Models/Customer/SubAccountCreateModel.cs b/src/Web/Grand.Web/Models/Customer/SubAccountCreateModel.csindex 524fe485e..bcf07c93b 100644--- a/src/Web/Grand.Web/Models/Customer/SubAccountCreateModel.cs+++ b/src/Web/Grand.Web/Models/Customer/SubAccountCreateModel.cs@@ -1,13 +1,19 @@using Grand.Infrastructure.Models;+using Grand.SharedKernel;using System.ComponentModel.DataAnnotations;namespace Grand.Web.Models.Customer{public class SubAccountCreateModel : BaseEntityModel{+ [MaxLength(FieldSizeLimits.EmailMaxLength)][DataType(DataType.EmailAddress)]public string Email { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)]public string FirstName { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)]public string LastName { get; set; }public bool Active { get; set; }[DataType(DataType.Password)]diff --git a/src/Web/Grand.Web/Models/Customer/SubAccountEditModel.cs b/src/Web/Grand.Web/Models/Customer/SubAccountEditModel.csindex 7e150100d..6f26aa51c 100644--- a/src/Web/Grand.Web/Models/Customer/SubAccountEditModel.cs+++ b/src/Web/Grand.Web/Models/Customer/SubAccountEditModel.cs@@ -1,13 +1,19 @@using Grand.Infrastructure.Models;+using Grand.SharedKernel;using System.ComponentModel.DataAnnotations;namespace Grand.Web.Models.Customer{public class SubAccountEditModel : BaseEntityModel{+ [MaxLength(FieldSizeLimits.EmailMaxLength)][DataType(DataType.EmailAddress)]public string Email { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)]public string FirstName { get; set; }++ [MaxLength(FieldSizeLimits.NameMaxLength)]public string LastName { get; set; }public bool Active { get; set; }