grandnode · KrzysztofPajak · Dec 22, 2024 · Dec 22, 2024 · Dec 22, 2024
diff --git a/GrandNode.sln b/GrandNode.sln
@@ -139,6 +139,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Api", "src\Mod
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.ScheduledTasks", "src\Modules\Grand.Module.ScheduledTasks\Grand.Module.ScheduledTasks.csproj", "{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Web.Models", "src\Web\Grand.Web.Models\Grand.Web.Models.csproj", "{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -368,6 +370,10 @@ Global
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -429,6 +435,7 @@ Global
 		{75F9D855-026B-4BCB-90CE-3800F02FA0A7} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
 		{E0B26803-010B-4198-8016-002242076B61} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
 		{136F1E35-8B20-465C-8D42-30A5A0D0DA1F} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
+		{7A07FB5A-4F1E-4D32-BAF6-D4E87BE35EF0} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}

diff --git a/src/Core/Grand.Domain/Common/CommonSettings.cs b/src/Core/Grand.Domain/Common/CommonSettings.cs
@@ -39,9 +39,4 @@ public class CommonSettings : ISettings
     ///     Gets or sets to edit product where auction ended
     /// </summary>
     public bool AllowEditProductEndedAuction { get; set; }
-
-    /// <summary>
-    ///     Gets or sets - allow user to read "let's encrypted file"
-    /// </summary>
-    public bool AllowToReadLetsEncryptFile { get; set; }
 }
diff --git a/....Common/Binders/CustomAttributesBinder.cs → ...re/ModelBinding/CustomAttributesBinder.cs b/....Common/Binders/CustomAttributesBinder.cs → ...re/ModelBinding/CustomAttributesBinder.cs
@@ -1,8 +1,8 @@
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System.Text.RegularExpressions;
 
-namespace Grand.Web.Common.Binders;
+namespace Grand.Infrastructure.ModelBinding;
 
 public class CustomAttributesBinder : IModelBinder
 {

diff --git a/...b.Common/Page/Paging/BasePageableModel.cs → ...nfrastructure/Models/BasePageableModel.cs b/...b.Common/Page/Paging/BasePageableModel.cs → ...nfrastructure/Models/BasePageableModel.cs
@@ -3,7 +3,7 @@
 using Grand.Domain;
 using Grand.SharedKernel.Attributes;
 
-namespace Grand.Web.Common.Page.Paging;
+namespace Grand.Infrastructure.Models;
 
 public abstract class BasePageableModel : IPageableModel
 {

diff --git a/...Web.Common/Models/CustomAttributeModel.cs → ...astructure/Models/CustomAttributeModel.cs b/...Web.Common/Models/CustomAttributeModel.cs → ...astructure/Models/CustomAttributeModel.cs
@@ -1,4 +1,4 @@
-namespace Grand.Web.Common.Models;
+namespace Grand.Infrastructure.Models;
 
 public class CustomAttributeModel
 {

diff --git a/....Web.Common/Page/Paging/IPageableModel.cs → ...d.Infrastructure/Models/IPageableModel.cs b/....Web.Common/Page/Paging/IPageableModel.cs → ...d.Infrastructure/Models/IPageableModel.cs
@@ -2,7 +2,7 @@
 
 using Grand.SharedKernel.Attributes;
 
-namespace Grand.Web.Common.Page.Paging;
+namespace Grand.Infrastructure.Models;
 
 /// <summary>
 ///     A collection of objects that has been split into pages.

diff --git a/src/Plugins/Theme.Modern/Theme.Modern.csproj b/src/Plugins/Theme.Modern/Theme.Modern.csproj
@@ -34,7 +34,7 @@
             <Private>false</Private>
             <ExcludeAssets>all</ExcludeAssets>
         </ProjectReference>
-        <ProjectReference Include="..\..\Web\Grand.Web\Grand.Web.csproj">
+        <ProjectReference Include="..\..\Web\Grand.Web.Models\Grand.Web.Models.csproj">
             <Private>false</Private>
             <ExcludeAssets>all</ExcludeAssets>
         </ProjectReference>

diff --git a/src/Plugins/Theme.Modern/Views/Modern/_ViewImports.cshtml b/src/Plugins/Theme.Modern/Views/Modern/_ViewImports.cshtml
@@ -14,7 +14,6 @@
 @using Grand.Web.Common.Extensions
 @using Grand.Web.Common.Security.Captcha
 @using Grand.Web.Common.Themes
-@using Grand.Web.Extensions
 @using Grand.Web.Models.Blogs
 @using Grand.Web.Models.Catalog
 @using Grand.Web.Models.Checkout

diff --git a/src/Web/Grand.Web.Admin/App_Data/GeoLite2-Country.mmdb b/src/Web/Grand.Web.Admin/App_Data/GeoLite2-Country.mmdb
diff --git a/...Admin/Areas/Admin/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml b/...Admin/Areas/Admin/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml
@@ -253,18 +253,6 @@
         <span asp-validation-for="CommonSettings.UseSystemEmailForContactUsForm"></span>
     </div>
 </div>
-<div class="form-group">
-    <div class="col-8 col-md-4 col-sm-4 text-right">
-        <admin-label asp-for="CommonSettings.AllowToReadLetsEncryptFile" class="control-label"/>
-    </div>
-    <div class="col-4 col-md-8 col-sm-8">
-        <label class="mt-checkbox mt-checkbox-outline control control-checkbox">
-            <admin-input asp-for="CommonSettings.AllowToReadLetsEncryptFile"/>
-            <div class="control__indicator"></div>
-        </label>
-        <span asp-validation-for="CommonSettings.AllowToReadLetsEncryptFile"></span>
-    </div>
-</div>
 <div class="form-group">
     <div class="col-8 col-md-4 col-sm-4 text-right">
         <admin-label asp-for="CommonSettings.AllowToSelectStore" class="control-label"/>

diff --git a/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs b/src/Web/Grand.Web.Admin/Controllers/CustomerController.cs
@@ -23,9 +23,9 @@
 using Grand.Web.Admin.Models.Orders;
 using Grand.Web.Common.DataSource;
 using Grand.Web.Common.Filters;
-using Grand.Web.Common.Models;
 using Grand.Web.Common.Security.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Admin.Controllers;
 

diff --git a/src/Web/Grand.Web.Admin/Models/Orders/AddProductToOrderModel.cs b/src/Web/Grand.Web.Admin/Models/Orders/AddProductToOrderModel.cs
@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Admin.Models.Orders;

diff --git a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs
@@ -94,9 +94,6 @@ public class CommonSettingsModel : BaseModel
         [GrandResourceDisplayName("Admin.Settings.GeneralCommon.UseSystemEmailForContactUsForm")]
         public bool UseSystemEmailForContactUsForm { get; set; }
 
-        [GrandResourceDisplayName("Admin.Settings.GeneralCommon.AllowToReadLetsEncryptFile")]
-        public bool AllowToReadLetsEncryptFile { get; set; }
-
         [GrandResourceDisplayName("Admin.Settings.GeneralCommon.AllowToSelectStore")]
         public bool AllowToSelectStore { get; set; }
 

diff --git a/src/Web/Grand.Web.Common/Binders/CustomAttributesBinderProvider.cs b/src/Web/Grand.Web.Common/Binders/CustomAttributesBinderProvider.cs
@@ -1,4 +1,5 @@
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
 

diff --git a/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/PageNavigationTagHelper.cs
@@ -1,6 +1,6 @@
 using Grand.Business.Core.Interfaces.Common.Localization;
+using Grand.Infrastructure.Models;
 using Grand.Web.Common.Extensions;
-using Grand.Web.Common.Page.Paging;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;

diff --git a/...d.Web/Models/Blogs/AddBlogCommentModel.cs → ...d.Web.Models/Blogs/AddBlogCommentModel.cs b/...d.Web/Models/Blogs/AddBlogCommentModel.cs → ...d.Web.Models/Blogs/AddBlogCommentModel.cs
diff --git a/...rand.Web/Models/Blogs/BlogCommentModel.cs → ...rand.Web.Models/Blogs/BlogCommentModel.cs b/...rand.Web/Models/Blogs/BlogCommentModel.cs → ...rand.Web.Models/Blogs/BlogCommentModel.cs
diff --git a/.../Models/Blogs/BlogPagingFilteringModel.cs → ....Models/Blogs/BlogPagingFilteringModel.cs b/.../Models/Blogs/BlogPagingFilteringModel.cs → ....Models/Blogs/BlogPagingFilteringModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Blogs;
 

diff --git a/...Web/Models/Blogs/BlogPostCategoryModel.cs → ...Web.Models/Blogs/BlogPostCategoryModel.cs b/...Web/Models/Blogs/BlogPostCategoryModel.cs → ...Web.Models/Blogs/BlogPostCategoryModel.cs
diff --git a/...and.Web/Models/Blogs/BlogPostListModel.cs → ...and.Web.Models/Blogs/BlogPostListModel.cs b/...and.Web/Models/Blogs/BlogPostListModel.cs → ...and.Web.Models/Blogs/BlogPostListModel.cs
diff --git a/...b/Grand.Web/Models/Blogs/BlogPostModel.cs → ...b/Grand.Web.Models/Blogs/BlogPostModel.cs b/...b/Grand.Web/Models/Blogs/BlogPostModel.cs → ...b/Grand.Web.Models/Blogs/BlogPostModel.cs
diff --git a/....Web/Models/Blogs/BlogPostTagListModel.cs → ....Web.Models/Blogs/BlogPostTagListModel.cs b/....Web/Models/Blogs/BlogPostTagListModel.cs → ....Web.Models/Blogs/BlogPostTagListModel.cs
diff --git a/...rand.Web/Models/Blogs/BlogPostTagModel.cs → ...rand.Web.Models/Blogs/BlogPostTagModel.cs b/...rand.Web/Models/Blogs/BlogPostTagModel.cs → ...rand.Web.Models/Blogs/BlogPostTagModel.cs
diff --git a/...eb/Models/Blogs/BlogPostYearMonthModel.cs → ...eb.Models/Blogs/BlogPostYearMonthModel.cs b/...eb/Models/Blogs/BlogPostYearMonthModel.cs → ...eb.Models/Blogs/BlogPostYearMonthModel.cs
diff --git a/...eb/Models/Blogs/HomePageBlogItemsModel.cs → ...eb.Models/Blogs/HomePageBlogItemsModel.cs b/...eb/Models/Blogs/HomePageBlogItemsModel.cs → ...eb.Models/Blogs/HomePageBlogItemsModel.cs
diff --git a/...rand.Web/Models/Catalog/BrandListModel.cs → ...rand.Web.Models/Catalog/BrandListModel.cs b/...rand.Web/Models/Catalog/BrandListModel.cs → ...rand.Web.Models/Catalog/BrandListModel.cs
diff --git a/...eb/Grand.Web/Models/Catalog/BrandModel.cs → ...eb/Grand.Web.Models/Catalog/BrandModel.cs b/...eb/Grand.Web/Models/Catalog/BrandModel.cs → ...eb/Grand.Web.Models/Catalog/BrandModel.cs
diff --git a/...nd.Web/Models/Catalog/BrandPagingModel.cs → ...nd.Web.Models/Catalog/BrandPagingModel.cs b/...nd.Web/Models/Catalog/BrandPagingModel.cs → ...nd.Web.Models/Catalog/BrandPagingModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

diff --git a/...ls/Catalog/CatalogPagingFilteringModel.cs → ...ls/Catalog/CatalogPagingFilteringModel.cs b/...ls/Catalog/CatalogPagingFilteringModel.cs → ...ls/Catalog/CatalogPagingFilteringModel.cs
@@ -3,7 +3,6 @@
 using Grand.Domain.Catalog;
 using Grand.Infrastructure.Extensions;
 using Grand.Infrastructure.Models;
-using Grand.Web.Common.Page.Paging;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Rendering;
 

diff --git a/...d.Web/Models/Catalog/CategoryListModel.cs → ...d.Web.Models/Catalog/CategoryListModel.cs b/...d.Web/Models/Catalog/CategoryListModel.cs → ...d.Web.Models/Catalog/CategoryListModel.cs
diff --git a/...Grand.Web/Models/Catalog/CategoryModel.cs → ...Grand.Web.Models/Catalog/CategoryModel.cs b/...Grand.Web/Models/Catalog/CategoryModel.cs → ...Grand.Web.Models/Catalog/CategoryModel.cs
diff --git a/...Models/Catalog/CategoryNavigationModel.cs → ...Models/Catalog/CategoryNavigationModel.cs b/...Models/Catalog/CategoryNavigationModel.cs → ...Models/Catalog/CategoryNavigationModel.cs
diff --git a/...Web/Models/Catalog/CategoryPagingModel.cs → ...Web.Models/Catalog/CategoryPagingModel.cs b/...Web/Models/Catalog/CategoryPagingModel.cs → ...Web.Models/Catalog/CategoryPagingModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

diff --git a/...Web/Models/Catalog/CategorySimpleModel.cs → ...Web.Models/Catalog/CategorySimpleModel.cs b/...Web/Models/Catalog/CategorySimpleModel.cs → ...Web.Models/Catalog/CategorySimpleModel.cs
diff --git a/...Web/Models/Catalog/CollectionListModel.cs → ...Web.Models/Catalog/CollectionListModel.cs b/...Web/Models/Catalog/CollectionListModel.cs → ...Web.Models/Catalog/CollectionListModel.cs
diff --git a/...and.Web/Models/Catalog/CollectionModel.cs → ...and.Web.Models/Catalog/CollectionModel.cs b/...and.Web/Models/Catalog/CollectionModel.cs → ...and.Web.Models/Catalog/CollectionModel.cs
diff --git a/...dels/Catalog/CollectionNavigationModel.cs → ...dels/Catalog/CollectionNavigationModel.cs b/...dels/Catalog/CollectionNavigationModel.cs → ...dels/Catalog/CollectionNavigationModel.cs
diff --git a/...b/Models/Catalog/CollectionPagingModel.cs → ...b.Models/Catalog/CollectionPagingModel.cs b/...b/Models/Catalog/CollectionPagingModel.cs → ...b.Models/Catalog/CollectionPagingModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

diff --git a/...eb/Models/Catalog/CompareProductsModel.cs → ...eb.Models/Catalog/CompareProductsModel.cs b/...eb/Models/Catalog/CompareProductsModel.cs → ...eb.Models/Catalog/CompareProductsModel.cs
diff --git a/...g/CustomerOutOfStockSubscriptionsModel.cs → ...g/CustomerOutOfStockSubscriptionsModel.cs b/...g/CustomerOutOfStockSubscriptionsModel.cs → ...g/CustomerOutOfStockSubscriptionsModel.cs
diff --git a/...Web/Grand.Web/Models/Catalog/MenuModel.cs → ...Web/Grand.Web.Models/Catalog/MenuModel.cs b/...Web/Grand.Web/Models/Catalog/MenuModel.cs → ...Web/Grand.Web.Models/Catalog/MenuModel.cs
diff --git a/...odels/Catalog/OutOfStockSubscribeModel.cs → ...odels/Catalog/OutOfStockSubscribeModel.cs b/...odels/Catalog/OutOfStockSubscribeModel.cs → ...odels/Catalog/OutOfStockSubscribeModel.cs
diff --git a/...Models/Catalog/PopularProductTagsModel.cs → ...Models/Catalog/PopularProductTagsModel.cs b/...Models/Catalog/PopularProductTagsModel.cs → ...Models/Catalog/PopularProductTagsModel.cs
diff --git a/...Models/Catalog/ProductAskQuestionModel.cs → ...Models/Catalog/ProductAskQuestionModel.cs b/...Models/Catalog/ProductAskQuestionModel.cs → ...Models/Catalog/ProductAskQuestionModel.cs
diff --git a/.../Catalog/ProductAskQuestionSimpleModel.cs → .../Catalog/ProductAskQuestionSimpleModel.cs b/.../Catalog/ProductAskQuestionSimpleModel.cs → .../Catalog/ProductAskQuestionSimpleModel.cs
diff --git a/...log/ProductDetailsAttributeChangeModel.cs → ...log/ProductDetailsAttributeChangeModel.cs b/...log/ProductDetailsAttributeChangeModel.cs → ...log/ProductDetailsAttributeChangeModel.cs
diff --git a/...Web/Models/Catalog/ProductDetailsModel.cs → ...Web.Models/Catalog/ProductDetailsModel.cs b/...Web/Models/Catalog/ProductDetailsModel.cs → ...Web.Models/Catalog/ProductDetailsModel.cs
diff --git a/...odels/Catalog/ProductEmailAFriendModel.cs → ...odels/Catalog/ProductEmailAFriendModel.cs b/...odels/Catalog/ProductEmailAFriendModel.cs → ...odels/Catalog/ProductEmailAFriendModel.cs
diff --git a/.../Grand.Web/Models/Catalog/ProductModel.cs → .../Grand.Web.Models/Catalog/ProductModel.cs b/.../Grand.Web/Models/Catalog/ProductModel.cs → .../Grand.Web.Models/Catalog/ProductModel.cs
@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.Catalog;

diff --git a/...eb/Models/Catalog/ProductOverviewModel.cs → ...eb.Models/Catalog/ProductOverviewModel.cs b/...eb/Models/Catalog/ProductOverviewModel.cs → ...eb.Models/Catalog/ProductOverviewModel.cs
diff --git a/....Web/Models/Catalog/ProductReviewModel.cs → ....Web.Models/Catalog/ProductReviewModel.cs b/....Web/Models/Catalog/ProductReviewModel.cs → ....Web.Models/Catalog/ProductReviewModel.cs
diff --git a/...dels/Catalog/ProductSpecificationModel.cs → ...dels/Catalog/ProductSpecificationModel.cs b/...dels/Catalog/ProductSpecificationModel.cs → ...dels/Catalog/ProductSpecificationModel.cs
diff --git a/...and.Web/Models/Catalog/ProductTagModel.cs → ...and.Web.Models/Catalog/ProductTagModel.cs b/...and.Web/Models/Catalog/ProductTagModel.cs → ...and.Web.Models/Catalog/ProductTagModel.cs
diff --git a/....Web/Models/Catalog/ProductsByTagModel.cs → ....Web.Models/Catalog/ProductsByTagModel.cs b/....Web/Models/Catalog/ProductsByTagModel.cs → ....Web.Models/Catalog/ProductsByTagModel.cs
diff --git a/...Models/Catalog/SearchAutoCompleteModel.cs → ...Models/Catalog/SearchAutoCompleteModel.cs b/...Models/Catalog/SearchAutoCompleteModel.cs → ...Models/Catalog/SearchAutoCompleteModel.cs
diff --git a/...rand.Web/Models/Catalog/SearchBoxModel.cs → ...rand.Web.Models/Catalog/SearchBoxModel.cs b/...rand.Web/Models/Catalog/SearchBoxModel.cs → ...rand.Web.Models/Catalog/SearchBoxModel.cs
diff --git a/...b/Grand.Web/Models/Catalog/SearchModel.cs → ...b/Grand.Web.Models/Catalog/SearchModel.cs b/...b/Grand.Web/Models/Catalog/SearchModel.cs → ...b/Grand.Web.Models/Catalog/SearchModel.cs
diff --git a/...and.Web/Models/Catalog/VendorListModel.cs → ...and.Web.Models/Catalog/VendorListModel.cs b/...and.Web/Models/Catalog/VendorListModel.cs → ...and.Web.Models/Catalog/VendorListModel.cs
diff --git a/...b/Grand.Web/Models/Catalog/VendorModel.cs → ...b/Grand.Web.Models/Catalog/VendorModel.cs b/...b/Grand.Web/Models/Catalog/VendorModel.cs → ...b/Grand.Web.Models/Catalog/VendorModel.cs
diff --git a/...b/Models/Catalog/VendorNavigationModel.cs → ...b.Models/Catalog/VendorNavigationModel.cs b/...b/Models/Catalog/VendorNavigationModel.cs → ...b.Models/Catalog/VendorNavigationModel.cs
diff --git a/...d.Web/Models/Catalog/VendorPagingModel.cs → ...d.Web.Models/Catalog/VendorPagingModel.cs b/...d.Web/Models/Catalog/VendorPagingModel.cs → ...d.Web.Models/Catalog/VendorPagingModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Catalog;
 

diff --git a/...s/Checkout/CheckoutBillingAddressModel.cs → ...s/Checkout/CheckoutBillingAddressModel.cs b/...s/Checkout/CheckoutBillingAddressModel.cs → ...s/Checkout/CheckoutBillingAddressModel.cs
diff --git a/...Models/Checkout/CheckoutCompletedModel.cs → ...Models/Checkout/CheckoutCompletedModel.cs b/...Models/Checkout/CheckoutCompletedModel.cs → ...Models/Checkout/CheckoutCompletedModel.cs
diff --git a/...b/Models/Checkout/CheckoutConfirmModel.cs → ...b.Models/Checkout/CheckoutConfirmModel.cs b/...b/Models/Checkout/CheckoutConfirmModel.cs → ...b.Models/Checkout/CheckoutConfirmModel.cs
diff --git a/...rand.Web/Models/Checkout/CheckoutModel.cs → ...rand.Web.Models/Checkout/CheckoutModel.cs b/...rand.Web/Models/Checkout/CheckoutModel.cs → ...rand.Web.Models/Checkout/CheckoutModel.cs
diff --git a/...dels/Checkout/CheckoutPaymentInfoModel.cs → ...dels/Checkout/CheckoutPaymentInfoModel.cs b/...dels/Checkout/CheckoutPaymentInfoModel.cs → ...dels/Checkout/CheckoutPaymentInfoModel.cs
diff --git a/...ls/Checkout/CheckoutPaymentMethodModel.cs → ...ls/Checkout/CheckoutPaymentMethodModel.cs b/...ls/Checkout/CheckoutPaymentMethodModel.cs → ...ls/Checkout/CheckoutPaymentMethodModel.cs
diff --git a/...dels/Checkout/CheckoutPickupPointModel.cs → ...dels/Checkout/CheckoutPickupPointModel.cs b/...dels/Checkout/CheckoutPickupPointModel.cs → ...dels/Checkout/CheckoutPickupPointModel.cs
diff --git a/.../Checkout/CheckoutShippingAddressModel.cs → .../Checkout/CheckoutShippingAddressModel.cs b/.../Checkout/CheckoutShippingAddressModel.cs → .../Checkout/CheckoutShippingAddressModel.cs
diff --git a/...s/Checkout/CheckoutShippingMethodModel.cs → ...s/Checkout/CheckoutShippingMethodModel.cs b/...s/Checkout/CheckoutShippingMethodModel.cs → ...s/Checkout/CheckoutShippingMethodModel.cs
diff --git a/...Models/Checkout/UpdateSectionJsonModel.cs → ...Models/Checkout/UpdateSectionJsonModel.cs b/...Models/Checkout/UpdateSectionJsonModel.cs → ...Models/Checkout/UpdateSectionJsonModel.cs
diff --git a/src/Web/Grand.Web/Models/Cms/WidgetModel.cs → src/Web/Grand.Web.Models/Cms/WidgetModel.cs b/src/Web/Grand.Web/Models/Cms/WidgetModel.cs → src/Web/Grand.Web.Models/Cms/WidgetModel.cs
diff --git a/...eb/Models/Common/AddressAttributeModel.cs → ...eb.Models/Common/AddressAttributeModel.cs b/...eb/Models/Common/AddressAttributeModel.cs → ...eb.Models/Common/AddressAttributeModel.cs
diff --git a/...b/Grand.Web/Models/Common/AddressModel.cs → ...b/Grand.Web.Models/Common/AddressModel.cs b/...b/Grand.Web/Models/Common/AddressModel.cs → ...b/Grand.Web.Models/Common/AddressModel.cs
@@ -1,7 +1,5 @@
 using Grand.Infrastructure.ModelBinding;
 using Grand.Infrastructure.Models;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System.ComponentModel.DataAnnotations;

diff --git a/.../Grand.Web/Models/Common/CurrencyModel.cs → .../Grand.Web.Models/Common/CurrencyModel.cs b/.../Grand.Web/Models/Common/CurrencyModel.cs → .../Grand.Web.Models/Common/CurrencyModel.cs
diff --git a/...eb/Grand.Web/Models/Common/FooterModel.cs → ...eb/Grand.Web.Models/Common/FooterModel.cs b/...eb/Grand.Web/Models/Common/FooterModel.cs → ...eb/Grand.Web.Models/Common/FooterModel.cs
diff --git a/.../Grand.Web/Models/Common/LanguageModel.cs → .../Grand.Web.Models/Common/LanguageModel.cs b/.../Grand.Web/Models/Common/LanguageModel.cs → .../Grand.Web.Models/Common/LanguageModel.cs
diff --git a/.../Grand.Web/Models/Common/LocationModel.cs → .../Grand.Web.Models/Common/LocationModel.cs b/.../Grand.Web/Models/Common/LocationModel.cs → .../Grand.Web.Models/Common/LocationModel.cs
diff --git a/...Web/Grand.Web/Models/Common/PagerModel.cs → ...Web/Grand.Web.Models/Common/PagerModel.cs b/...Web/Grand.Web/Models/Common/PagerModel.cs → ...Web/Grand.Web.Models/Common/PagerModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Common;
 

diff --git a/...b/Models/Common/PrivacyPreferenceModel.cs → ...b.Models/Common/PrivacyPreferenceModel.cs b/...b/Models/Common/PrivacyPreferenceModel.cs → ...b.Models/Common/PrivacyPreferenceModel.cs
diff --git a/...b/Models/Common/ShoppingCartLinksModel.cs → ...b.Models/Common/ShoppingCartLinksModel.cs b/...b/Models/Common/ShoppingCartLinksModel.cs → ...b.Models/Common/ShoppingCartLinksModel.cs
diff --git a/...b/Grand.Web/Models/Common/SitemapModel.cs → ...b/Grand.Web.Models/Common/SitemapModel.cs b/...b/Grand.Web/Models/Common/SitemapModel.cs → ...b/Grand.Web.Models/Common/SitemapModel.cs
diff --git a/...d.Web/Models/Common/StateProvinceModel.cs → ...d.Web.Models/Common/StateProvinceModel.cs b/...d.Web/Models/Common/StateProvinceModel.cs → ...d.Web.Models/Common/StateProvinceModel.cs
diff --git a/...Web/Grand.Web/Models/Common/StoreModel.cs → ...Web/Grand.Web.Models/Common/StoreModel.cs b/...Web/Grand.Web/Models/Common/StoreModel.cs → ...Web/Grand.Web.Models/Common/StoreModel.cs
diff --git a/...rand.Web/Models/Common/StoreThemeModel.cs → ...rand.Web.Models/Common/StoreThemeModel.cs b/...rand.Web/Models/Common/StoreThemeModel.cs → ...rand.Web.Models/Common/StoreThemeModel.cs
diff --git a/...ls/Contact/ContactAttributeChangeModel.cs → ...ls/Contact/ContactAttributeChangeModel.cs b/...ls/Contact/ContactAttributeChangeModel.cs → ...ls/Contact/ContactAttributeChangeModel.cs
@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.Contact;

diff --git a/...rand.Web/Models/Contact/ContactUsModel.cs → ...rand.Web.Models/Contact/ContactUsModel.cs b/...rand.Web/Models/Contact/ContactUsModel.cs → ...rand.Web.Models/Contact/ContactUsModel.cs
@@ -2,8 +2,6 @@
 using Grand.Domain.Common;
 using Grand.Infrastructure.ModelBinding;
 using Grand.Infrastructure.Models;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.Contact;

diff --git a/...eb/Grand.Web/Models/Course/CourseModel.cs → ...eb/Grand.Web.Models/Course/CourseModel.cs b/...eb/Grand.Web/Models/Course/CourseModel.cs → ...eb/Grand.Web.Models/Course/CourseModel.cs
diff --git a/...eb/Grand.Web/Models/Course/LessonModel.cs → ...eb/Grand.Web.Models/Course/LessonModel.cs b/...eb/Grand.Web/Models/Course/LessonModel.cs → ...eb/Grand.Web.Models/Course/LessonModel.cs
diff --git a/...Models/Customer/AccountActivationModel.cs → ...Models/Customer/AccountActivationModel.cs b/...Models/Customer/AccountActivationModel.cs → ...Models/Customer/AccountActivationModel.cs
diff --git a/...eb/Models/Customer/ChangePasswordModel.cs → ...eb.Models/Customer/ChangePasswordModel.cs b/...eb/Models/Customer/ChangePasswordModel.cs → ...eb.Models/Customer/ChangePasswordModel.cs
diff --git a/...Grand.Web/Models/Customer/CoursesModel.cs → ...Grand.Web.Models/Customer/CoursesModel.cs b/...Grand.Web/Models/Customer/CoursesModel.cs → ...Grand.Web.Models/Customer/CoursesModel.cs
diff --git a/...dels/Customer/CustomerAddressEditModel.cs → ...dels/Customer/CustomerAddressEditModel.cs b/...dels/Customer/CustomerAddressEditModel.cs → ...dels/Customer/CustomerAddressEditModel.cs
diff --git a/...dels/Customer/CustomerAddressListModel.cs → ...dels/Customer/CustomerAddressListModel.cs b/...dels/Customer/CustomerAddressListModel.cs → ...dels/Customer/CustomerAddressListModel.cs
diff --git a/...Models/Customer/CustomerAttributeModel.cs → ...Models/Customer/CustomerAttributeModel.cs b/...Models/Customer/CustomerAttributeModel.cs → ...Models/Customer/CustomerAttributeModel.cs
diff --git a/.../Models/Customer/CustomerAuctionsModel.cs → ....Models/Customer/CustomerAuctionsModel.cs b/.../Models/Customer/CustomerAuctionsModel.cs → ....Models/Customer/CustomerAuctionsModel.cs
diff --git a/...omer/CustomerDownloadableProductsModel.cs → ...omer/CustomerDownloadableProductsModel.cs b/...omer/CustomerDownloadableProductsModel.cs → ...omer/CustomerDownloadableProductsModel.cs
diff --git a/....Web/Models/Customer/CustomerInfoModel.cs → ....Web.Models/Customer/CustomerInfoModel.cs b/....Web/Models/Customer/CustomerInfoModel.cs → ....Web.Models/Customer/CustomerInfoModel.cs
@@ -2,8 +2,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;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;

diff --git a/...odels/Customer/CustomerNavigationModel.cs → ...odels/Customer/CustomerNavigationModel.cs b/...odels/Customer/CustomerNavigationModel.cs → ...odels/Customer/CustomerNavigationModel.cs
diff --git a/...Web/Models/Customer/CustomerNotesModel.cs → ...Web.Models/Customer/CustomerNotesModel.cs b/...Web/Models/Customer/CustomerNotesModel.cs → ...Web.Models/Customer/CustomerNotesModel.cs
diff --git a/...ls/Customer/CustomerProductReviewModel.cs → ...ls/Customer/CustomerProductReviewModel.cs b/...ls/Customer/CustomerProductReviewModel.cs → ...ls/Customer/CustomerProductReviewModel.cs
diff --git a/...Web/Models/Customer/DeleteAccountModel.cs → ...Web.Models/Customer/DeleteAccountModel.cs b/...Web/Models/Customer/DeleteAccountModel.cs → ...Web.Models/Customer/DeleteAccountModel.cs
diff --git a/...eb/Models/Customer/DocumentPagingModel.cs → ...eb.Models/Customer/DocumentPagingModel.cs b/...eb/Models/Customer/DocumentPagingModel.cs → ...eb.Models/Customer/DocumentPagingModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Customer;
 

diff --git a/...and.Web/Models/Customer/DocumentsModel.cs → ...and.Web.Models/Customer/DocumentsModel.cs b/...and.Web/Models/Customer/DocumentsModel.cs → ...and.Web.Models/Customer/DocumentsModel.cs
diff --git a/...omer/ExternalAuthenticationMethodModel.cs → ...omer/ExternalAuthenticationMethodModel.cs b/...omer/ExternalAuthenticationMethodModel.cs → ...omer/ExternalAuthenticationMethodModel.cs
diff --git a/...b/Grand.Web/Models/Customer/LoginModel.cs → ...b/Grand.Web.Models/Customer/LoginModel.cs b/...b/Grand.Web/Models/Customer/LoginModel.cs → ...b/Grand.Web.Models/Customer/LoginModel.cs
diff --git a/.../Customer/PasswordRecoveryConfirmModel.cs → .../Customer/PasswordRecoveryConfirmModel.cs b/.../Customer/PasswordRecoveryConfirmModel.cs → .../Customer/PasswordRecoveryConfirmModel.cs
diff --git a/...b/Models/Customer/PaswordRecoveryModel.cs → ...b.Models/Customer/PaswordRecoveryModel.cs b/...b/Models/Customer/PaswordRecoveryModel.cs → ...b.Models/Customer/PaswordRecoveryModel.cs
diff --git a/...rand.Web/Models/Customer/RegisterModel.cs → ...rand.Web.Models/Customer/RegisterModel.cs b/...rand.Web/Models/Customer/RegisterModel.cs → ...rand.Web.Models/Customer/RegisterModel.cs
@@ -1,8 +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;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;

diff --git a/...eb/Models/Customer/RegisterResultModel.cs → ...eb.Models/Customer/RegisterResultModel.cs b/...eb/Models/Customer/RegisterResultModel.cs → ...eb.Models/Customer/RegisterResultModel.cs
diff --git a/.../Models/Customer/SubAccountCreateModel.cs → ....Models/Customer/SubAccountCreateModel.cs b/.../Models/Customer/SubAccountCreateModel.cs → ....Models/Customer/SubAccountCreateModel.cs
diff --git a/...eb/Models/Customer/SubAccountEditModel.cs → ...eb.Models/Customer/SubAccountEditModel.cs b/...eb/Models/Customer/SubAccountEditModel.cs → ...eb.Models/Customer/SubAccountEditModel.cs
diff --git a/.../Models/Customer/SubAccountSimpleModel.cs → ....Models/Customer/SubAccountSimpleModel.cs b/.../Models/Customer/SubAccountSimpleModel.cs → ....Models/Customer/SubAccountSimpleModel.cs
diff --git a/src/Web/Grand.Web.Models/Grand.Web.Models.csproj b/src/Web/Grand.Web.Models/Grand.Web.Models.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\Build\Grand.Common.props" />
+    <ItemGroup>
+        <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
+        <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
+        <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/...se/AddKnowledgebaseArticleCommentModel.cs → ...se/AddKnowledgebaseArticleCommentModel.cs b/...se/AddKnowledgebaseArticleCommentModel.cs → ...se/AddKnowledgebaseArticleCommentModel.cs
diff --git a/...ebase/KnowledgebaseArticleCommentModel.cs → ...ebase/KnowledgebaseArticleCommentModel.cs b/...ebase/KnowledgebaseArticleCommentModel.cs → ...ebase/KnowledgebaseArticleCommentModel.cs
diff --git a/...nowledgebase/KnowledgebaseArticleModel.cs → ...nowledgebase/KnowledgebaseArticleModel.cs b/...nowledgebase/KnowledgebaseArticleModel.cs → ...nowledgebase/KnowledgebaseArticleModel.cs
diff --git a/...owledgebase/KnowledgebaseCategoryModel.cs → ...owledgebase/KnowledgebaseCategoryModel.cs b/...owledgebase/KnowledgebaseCategoryModel.cs → ...owledgebase/KnowledgebaseCategoryModel.cs
diff --git a/...owledgebase/KnowledgebaseHomePageModel.cs → ...owledgebase/KnowledgebaseHomePageModel.cs b/...owledgebase/KnowledgebaseHomePageModel.cs → ...owledgebase/KnowledgebaseHomePageModel.cs
diff --git a/...s/Knowledgebase/KnowledgebaseItemModel.cs → ...s/Knowledgebase/KnowledgebaseItemModel.cs b/...s/Knowledgebase/KnowledgebaseItemModel.cs → ...s/Knowledgebase/KnowledgebaseItemModel.cs
diff --git a/...eb/Grand.Web/Models/Media/PictureModel.cs → ...eb/Grand.Web.Models/Media/PictureModel.cs b/...eb/Grand.Web/Models/Media/PictureModel.cs → ...eb/Grand.Web.Models/Media/PictureModel.cs
diff --git a/...nd.Web/Models/News/AddNewsCommentModel.cs → ...nd.Web.Models/News/AddNewsCommentModel.cs b/...nd.Web/Models/News/AddNewsCommentModel.cs → ...nd.Web.Models/News/AddNewsCommentModel.cs
diff --git a/...Web/Models/News/HomePageNewsItemsModel.cs → ...Web.Models/News/HomePageNewsItemsModel.cs b/...Web/Models/News/HomePageNewsItemsModel.cs → ...Web.Models/News/HomePageNewsItemsModel.cs
diff --git a/...Grand.Web/Models/News/NewsCommentModel.cs → ...Grand.Web.Models/News/NewsCommentModel.cs b/...Grand.Web/Models/News/NewsCommentModel.cs → ...Grand.Web.Models/News/NewsCommentModel.cs
diff --git a/...rand.Web/Models/News/NewsItemListModel.cs → ...rand.Web.Models/News/NewsItemListModel.cs b/...rand.Web/Models/News/NewsItemListModel.cs → ...rand.Web.Models/News/NewsItemListModel.cs
diff --git a/...eb/Grand.Web/Models/News/NewsItemModel.cs → ...eb/Grand.Web.Models/News/NewsItemModel.cs b/...eb/Grand.Web/Models/News/NewsItemModel.cs → ...eb/Grand.Web.Models/News/NewsItemModel.cs
diff --git a/...b/Models/News/NewsPagingFilteringModel.cs → ...b.Models/News/NewsPagingFilteringModel.cs b/...b/Models/News/NewsPagingFilteringModel.cs → ...b.Models/News/NewsPagingFilteringModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.News;
 

diff --git a/...els/Newsletter/NewsletterCategoryModel.cs → ...els/Newsletter/NewsletterCategoryModel.cs b/...els/Newsletter/NewsletterCategoryModel.cs → ...els/Newsletter/NewsletterCategoryModel.cs
diff --git a/...sletter/SubscribeNewsletterResultModel.cs → ...sletter/SubscribeNewsletterResultModel.cs b/...sletter/SubscribeNewsletterResultModel.cs → ...sletter/SubscribeNewsletterResultModel.cs
diff --git a/...Newsletter/SubscriptionActivationModel.cs → ...Newsletter/SubscriptionActivationModel.cs b/...Newsletter/SubscriptionActivationModel.cs → ...Newsletter/SubscriptionActivationModel.cs
diff --git a/...nd.Web/Models/Orders/AddOrderNoteModel.cs → ...nd.Web.Models/Orders/AddOrderNoteModel.cs b/...nd.Web/Models/Orders/AddOrderNoteModel.cs → ...nd.Web.Models/Orders/AddOrderNoteModel.cs
diff --git a/...dels/Orders/CustomerLoyaltyPointsModel.cs → ...dels/Orders/CustomerLoyaltyPointsModel.cs b/...dels/Orders/CustomerLoyaltyPointsModel.cs → ...dels/Orders/CustomerLoyaltyPointsModel.cs
diff --git a/...Orders/CustomerMerchandiseReturnsModel.cs → ...Orders/CustomerMerchandiseReturnsModel.cs b/...Orders/CustomerMerchandiseReturnsModel.cs → ...Orders/CustomerMerchandiseReturnsModel.cs
diff --git a/...b/Models/Orders/CustomerOrderListModel.cs → ...b.Models/Orders/CustomerOrderListModel.cs b/...b/Models/Orders/CustomerOrderListModel.cs → ...b.Models/Orders/CustomerOrderListModel.cs
diff --git a/...s/Orders/MerchandiseReturnDetailsModel.cs → ...s/Orders/MerchandiseReturnDetailsModel.cs b/...s/Orders/MerchandiseReturnDetailsModel.cs → ...s/Orders/MerchandiseReturnDetailsModel.cs
diff --git a/...b/Models/Orders/MerchandiseReturnModel.cs → ...b.Models/Orders/MerchandiseReturnModel.cs b/...b/Models/Orders/MerchandiseReturnModel.cs → ...b.Models/Orders/MerchandiseReturnModel.cs
diff --git a/...nd.Web/Models/Orders/OrderDetailsModel.cs → ...nd.Web.Models/Orders/OrderDetailsModel.cs b/...nd.Web/Models/Orders/OrderDetailsModel.cs → ...nd.Web.Models/Orders/OrderDetailsModel.cs
diff --git a/...and.Web/Models/Orders/OrderPagingModel.cs → ...and.Web.Models/Orders/OrderPagingModel.cs b/...and.Web/Models/Orders/OrderPagingModel.cs → ...and.Web.Models/Orders/OrderPagingModel.cs
@@ -1,4 +1,4 @@
-using Grand.Web.Common.Page.Paging;
+using Grand.Infrastructure.Models;
 
 namespace Grand.Web.Models.Orders;
 

diff --git a/...Web/Models/Orders/ShipmentDetailsModel.cs → ...Web.Models/Orders/ShipmentDetailsModel.cs b/...Web/Models/Orders/ShipmentDetailsModel.cs → ...Web.Models/Orders/ShipmentDetailsModel.cs
diff --git a/...and.Web/Models/Pages/AuthenticateModel.cs → ...and.Web.Models/Pages/AuthenticateModel.cs b/...and.Web/Models/Pages/AuthenticateModel.cs → ...and.Web.Models/Pages/AuthenticateModel.cs
diff --git a/src/Web/Grand.Web/Models/Pages/PageModel.cs → src/Web/Grand.Web.Models/Pages/PageModel.cs b/src/Web/Grand.Web/Models/Pages/PageModel.cs → src/Web/Grand.Web.Models/Pages/PageModel.cs
diff --git a/...dels/PushNotifications/PublicInfoModel.cs → ...dels/PushNotifications/PublicInfoModel.cs b/...dels/PushNotifications/PublicInfoModel.cs → ...dels/PushNotifications/PublicInfoModel.cs
diff --git a/...nd.Web/Models/ShoppingCart/AddBidModel.cs → ...nd.Web.Models/ShoppingCart/AddBidModel.cs b/...nd.Web/Models/ShoppingCart/AddBidModel.cs → ...nd.Web.Models/ShoppingCart/AddBidModel.cs
diff --git a/.../ShoppingCart/AddCartFromWishlistModel.cs → .../ShoppingCart/AddCartFromWishlistModel.cs b/.../ShoppingCart/AddCartFromWishlistModel.cs → .../ShoppingCart/AddCartFromWishlistModel.cs
diff --git a/...Web/Models/ShoppingCart/AddToCartModel.cs → ...Web.Models/ShoppingCart/AddToCartModel.cs b/...Web/Models/ShoppingCart/AddToCartModel.cs → ...Web.Models/ShoppingCart/AddToCartModel.cs
diff --git a/...s/ShoppingCart/ChangeTypeCartItemModel.cs → ...s/ShoppingCart/ChangeTypeCartItemModel.cs b/...s/ShoppingCart/ChangeTypeCartItemModel.cs → ...s/ShoppingCart/ChangeTypeCartItemModel.cs
diff --git a/...ingCart/CheckoutAttributeSelectedModel.cs → ...ingCart/CheckoutAttributeSelectedModel.cs b/...ingCart/CheckoutAttributeSelectedModel.cs → ...ingCart/CheckoutAttributeSelectedModel.cs
@@ -1,5 +1,5 @@
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.ShoppingCart;

diff --git a/...odels/ShoppingCart/DeleteCartItemModel.cs → ...odels/ShoppingCart/DeleteCartItemModel.cs b/...odels/ShoppingCart/DeleteCartItemModel.cs → ...odels/ShoppingCart/DeleteCartItemModel.cs
diff --git a/...odels/ShoppingCart/DiscountCouponModel.cs → ...odels/ShoppingCart/DiscountCouponModel.cs b/...odels/ShoppingCart/DiscountCouponModel.cs → ...odels/ShoppingCart/DiscountCouponModel.cs
diff --git a/...els/ShoppingCart/EstimateShippingModel.cs → ...els/ShoppingCart/EstimateShippingModel.cs b/...els/ShoppingCart/EstimateShippingModel.cs → ...els/ShoppingCart/EstimateShippingModel.cs
diff --git a/...ls/ShoppingCart/GiftVoucherCouponModel.cs → ...ls/ShoppingCart/GiftVoucherCouponModel.cs b/...ls/ShoppingCart/GiftVoucherCouponModel.cs → ...ls/ShoppingCart/GiftVoucherCouponModel.cs
diff --git a/...els/ShoppingCart/MiniShoppingCartModel.cs → ...els/ShoppingCart/MiniShoppingCartModel.cs b/...els/ShoppingCart/MiniShoppingCartModel.cs → ...els/ShoppingCart/MiniShoppingCartModel.cs
diff --git a/.../Models/ShoppingCart/MiniWishlistModel.cs → ....Models/ShoppingCart/MiniWishlistModel.cs b/.../Models/ShoppingCart/MiniWishlistModel.cs → ....Models/ShoppingCart/MiniWishlistModel.cs
diff --git a/...b/Models/ShoppingCart/OrderTotalsModel.cs → ...b.Models/ShoppingCart/OrderTotalsModel.cs b/...b/Models/ShoppingCart/OrderTotalsModel.cs → ...b.Models/ShoppingCart/OrderTotalsModel.cs
diff --git a/...Models/ShoppingCart/ProductCatalogCart.cs → ...Models/ShoppingCart/ProductCatalogCart.cs b/...Models/ShoppingCart/ProductCatalogCart.cs → ...Models/ShoppingCart/ProductCatalogCart.cs
diff --git a/...Models/ShoppingCart/ProductDetailsCart.cs → ...Models/ShoppingCart/ProductDetailsCart.cs b/...Models/ShoppingCart/ProductDetailsCart.cs → ...Models/ShoppingCart/ProductDetailsCart.cs
@@ -1,6 +1,6 @@
 using Grand.Domain.Orders;
-using Grand.Web.Common.Binders;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.ModelBinding;
+using Grand.Infrastructure.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Grand.Web.Models.ShoppingCart;

diff --git a/.../Models/ShoppingCart/ShoppingCartModel.cs → ....Models/ShoppingCart/ShoppingCartModel.cs b/.../Models/ShoppingCart/ShoppingCartModel.cs → ....Models/ShoppingCart/ShoppingCartModel.cs
diff --git a/...odels/ShoppingCart/UpdateQuantityModel.cs → ...odels/ShoppingCart/UpdateQuantityModel.cs b/...odels/ShoppingCart/UpdateQuantityModel.cs → ...odels/ShoppingCart/UpdateQuantityModel.cs
diff --git a/...ShoppingCart/WishlistEmailAFriendModel.cs → ...ShoppingCart/WishlistEmailAFriendModel.cs b/...ShoppingCart/WishlistEmailAFriendModel.cs → ...ShoppingCart/WishlistEmailAFriendModel.cs
diff --git a/....Web/Models/ShoppingCart/WishlistModel.cs → ....Web.Models/ShoppingCart/WishlistModel.cs b/....Web/Models/ShoppingCart/WishlistModel.cs → ....Web.Models/ShoppingCart/WishlistModel.cs
diff --git a/...nd.Web/Models/Vendors/ApplyVendorModel.cs → ...nd.Web.Models/Vendors/ApplyVendorModel.cs b/...nd.Web/Models/Vendors/ApplyVendorModel.cs → ...nd.Web.Models/Vendors/ApplyVendorModel.cs
diff --git a/....Web/Models/Vendors/ContactVendorModel.cs → ....Web.Models/Vendors/ContactVendorModel.cs b/....Web/Models/Vendors/ContactVendorModel.cs → ....Web.Models/Vendors/ContactVendorModel.cs
diff --git a/....Web/Models/Vendors/VendorAddressModel.cs → ....Web.Models/Vendors/VendorAddressModel.cs b/....Web/Models/Vendors/VendorAddressModel.cs → ....Web.Models/Vendors/VendorAddressModel.cs
diff --git a/...dels/Vendors/VendorReviewOverviewModel.cs → ...dels/Vendors/VendorReviewOverviewModel.cs b/...dels/Vendors/VendorReviewOverviewModel.cs → ...dels/Vendors/VendorReviewOverviewModel.cs
diff --git a/src/Web/Grand.Web.Vendor/App_Data/GeoLite2-Country.mmdb b/src/Web/Grand.Web.Vendor/App_Data/GeoLite2-Country.mmdb
diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml
@@ -10107,9 +10107,6 @@
 	<Resource Name="Admin.Settings.GeneralCommon.AllowSlashChar" Area="Admin">
 		<Value>Allow to use slash char</Value>
 	</Resource>
-	<Resource Name="Admin.Settings.GeneralCommon.AllowToReadLetsEncryptFile" Area="Admin">
-		<Value>Allow to read Let's Encrypt file</Value>
-	</Resource>
 	<Resource Name="Admin.Settings.GeneralCommon.AllowToSelectAdminTheme" Area="Admin">
 		<Value>Allow to select admin theme</Value>
 	</Resource>

diff --git a/src/Web/Grand.Web/Commands/Models/Contact/ContactAttributeChangeCommand.cs b/src/Web/Grand.Web/Commands/Models/Contact/ContactAttributeChangeCommand.cs
@@ -1,6 +1,6 @@
 using Grand.Domain.Customers;
 using Grand.Domain.Stores;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Commands.Models.Contact;

diff --git a/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs b/src/Web/Grand.Web/Commands/Models/ShoppingCart/SaveCheckoutAttributesCommand.cs
@@ -2,7 +2,7 @@
 using Grand.Domain.Customers;
 using Grand.Domain.Orders;
 using Grand.Domain.Stores;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Commands.Models.ShoppingCart;

diff --git a/src/Web/Grand.Web/Controllers/LetsEncryptController.cs b/src/Web/Grand.Web/Controllers/LetsEncryptController.cs
diff --git a/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs b/src/Web/Grand.Web/Features/Models/Common/GetParseCustomAddressAttributes.cs
@@ -1,5 +1,5 @@
 using Grand.Domain.Common;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Features.Models.Common;

diff --git a/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs b/src/Web/Grand.Web/Features/Models/Customers/GetParseCustomAttributes.cs
@@ -1,5 +1,5 @@
 using Grand.Domain.Common;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Features.Models.Customers;

diff --git a/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs b/src/Web/Grand.Web/Features/Models/ShoppingCart/GetParseProductAttributes.cs
@@ -1,6 +1,6 @@
 using Grand.Domain.Catalog;
 using Grand.Domain.Common;
-using Grand.Web.Common.Models;
+using Grand.Infrastructure.Models;
 using MediatR;
 
 namespace Grand.Web.Features.Models.ShoppingCart;

diff --git a/src/Web/Grand.Web/Grand.Web.csproj b/src/Web/Grand.Web/Grand.Web.csproj
@@ -20,6 +20,7 @@
 		<ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" />
 		<ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
 		<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
+		<ProjectReference Include="..\Grand.Web.Models\Grand.Web.Models.csproj" />
 		<ProjectReference Include="..\Grand.Web.Common\Grand.Web.Common.csproj" />
 		<ProjectReference Include="..\Grand.Web.Admin\Grand.Web.Admin.csproj" />
 		<ProjectReference Include="..\Grand.Web.Vendor\Grand.Web.Vendor.csproj" />