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
Move DTO classes to Grand.Business.Core project
support9a841903bd9d
diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.csindex 8d3b3155e..bb7f75b50 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs@@ -1,5 +1,5 @@using Grand.Business.Catalog.Extensions;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Business.Core.Interfaces.Common.Localization;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.csindex 79b23bde4..29962d95a 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs@@ -1,5 +1,5 @@using Grand.Business.Catalog.Extensions;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Categories;using Grand.Business.Core.Interfaces.Common.Localization;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.csindex fdb74289d..b42ba4858 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs@@ -1,5 +1,5 @@using Grand.Business.Catalog.Extensions;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Business.Core.Interfaces.Common.Localization;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.csindex c7b912c98..754187f5a 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/BrandProfile.cs@@ -1,5 +1,5 @@using AutoMapper;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Domain.Catalog;using Grand.Infrastructure.Mapper;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.csindex 27e7d1771..b8a4f3a33 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CategoryProfile.cs@@ -1,5 +1,5 @@using AutoMapper;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Domain.Catalog;using Grand.Infrastructure.Mapper;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.csindex 62714ad77..8cc17ac59 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/CollectionProfile.cs@@ -1,5 +1,5 @@using AutoMapper;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Domain.Catalog;using Grand.Infrastructure.Mapper;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.csindex 6f051773d..e4268ece8 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/Mapper/ProductProfile.cs@@ -1,5 +1,5 @@using AutoMapper;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Domain.Catalog;using Grand.Infrastructure.Mapper;diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs b/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.csindex 2dde9982e..2b8930e9e 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs+++ b/src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs@@ -1,5 +1,5 @@using Grand.Business.Catalog.Extensions;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Business.Core.Interfaces.Catalog.Categories;diff --git a/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs b/src/Business/Grand.Business.Catalog/Startup/StartupApplication.csindex 9d95da1d3..8118a3b33 100644--- a/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs@@ -22,7 +22,7 @@ using Grand.Business.Core.Interfaces.Catalog.Directory;using Grand.Business.Core.Interfaces.ExportImport;using Grand.Domain.Catalog;using Grand.Business.Catalog.Services.ExportImport;-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;namespace Grand.Business.Catalog.Startup{diff --git a/src/Business/Grand.Business.Checkout/Services/ExportImpot/OrderSchemaProperty.cs b/src/Business/Grand.Business.Checkout/Services/ExportImpot/OrderSchemaProperty.csindex 6d03bff9b..c1811d16b 100644--- a/src/Business/Grand.Business.Checkout/Services/ExportImpot/OrderSchemaProperty.cs+++ b/src/Business/Grand.Business.Checkout/Services/ExportImpot/OrderSchemaProperty.cs@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.ExportImport;using Grand.Business.Core.Utilities.ExportImport;using Grand.Domain.Orders;-namespace Grand.Business.Checkout.Services.ExportImport+namespace Grand.Business.Checkout.Services.ExportImpot{public class OrderSchemaProperty : ISchemaProperty<Order>{diff --git a/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs b/src/Business/Grand.Business.Checkout/Startup/StartupApplication.csindex db14304ba..0450b0104 100644--- a/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Checkout/Startup/StartupApplication.cs@@ -1,5 +1,5 @@using Grand.Business.Checkout.Services.CheckoutAttributes;-using Grand.Business.Checkout.Services.ExportImport;+using Grand.Business.Checkout.Services.ExportImpot;using Grand.Business.Checkout.Services.GiftVouchers;using Grand.Business.Checkout.Services.Orders;using Grand.Business.Checkout.Services.Payments;diff --git a/src/Business/Grand.Business.Common/Services/ExportImport/CountryImportDataObject.cs b/src/Business/Grand.Business.Common/Services/ExportImport/CountryImportDataObject.csindex ba84c82f6..02a3571ee 100644--- a/src/Business/Grand.Business.Common/Services/ExportImport/CountryImportDataObject.cs+++ b/src/Business/Grand.Business.Common/Services/ExportImport/CountryImportDataObject.cs@@ -1,10 +1,11 @@-using Grand.Business.Core.Interfaces.Common.Directory;+using Grand.Business.Core.Dto;+using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.ExportImport;using Grand.Domain.Directory;namespace Grand.Business.Common.Services.ExportImport{- public class CountryImportDataObject : IImportDataObject<CountryStates>+ public class CountryImportDataObject : IImportDataObject<CountryStatesDto>{private readonly ICountryService _countryService;@@ -13,7 +14,7 @@ namespace Grand.Business.Common.Services.ExportImport_countryService = countryService;}- public async Task Execute(IEnumerable<CountryStates> data)+ public async Task Execute(IEnumerable<CountryStatesDto> data){foreach (var item in data){@@ -21,28 +22,28 @@ namespace Grand.Business.Common.Services.ExportImport}}- private async Task Import(CountryStates countryStatesDto)+ private async Task Import(CountryStatesDto countryStatesDtoDto){- var country = await _countryService.GetCountryByTwoLetterIsoCode(countryStatesDto.Country);+ var country = await _countryService.GetCountryByTwoLetterIsoCode(countryStatesDtoDto.Country);if (country == null)return;- var state = country.StateProvinces.FirstOrDefault(x => x.Abbreviation.Equals(countryStatesDto.Abbreviation, StringComparison.OrdinalIgnoreCase));+ var state = country.StateProvinces.FirstOrDefault(x => x.Abbreviation.Equals(countryStatesDtoDto.Abbreviation, StringComparison.OrdinalIgnoreCase));if (state != null){- state.Name = countryStatesDto.StateProvinceName;- state.Abbreviation = countryStatesDto.Abbreviation;- state.Published = countryStatesDto.Published;- state.DisplayOrder = countryStatesDto.DisplayOrder;+ state.Name = countryStatesDtoDto.StateProvinceName;+ state.Abbreviation = countryStatesDtoDto.Abbreviation;+ state.Published = countryStatesDtoDto.Published;+ state.DisplayOrder = countryStatesDtoDto.DisplayOrder;await _countryService.UpdateStateProvince(state, country.Id);}else{state = new StateProvince {- Name = countryStatesDto.StateProvinceName,- Abbreviation = countryStatesDto.Abbreviation,- Published = countryStatesDto.Published,- DisplayOrder = countryStatesDto.DisplayOrder+ Name = countryStatesDtoDto.StateProvinceName,+ Abbreviation = countryStatesDtoDto.Abbreviation,+ Published = countryStatesDtoDto.Published,+ DisplayOrder = countryStatesDtoDto.DisplayOrder};await _countryService.InsertStateProvince(state, country.Id);}diff --git a/src/Business/Grand.Business.Common/Services/ExportImport/CountrySchemaProperty.cs b/src/Business/Grand.Business.Common/Services/ExportImport/CountrySchemaProperty.csindex eb5ccc8c2..967571b79 100644--- a/src/Business/Grand.Business.Common/Services/ExportImport/CountrySchemaProperty.cs+++ b/src/Business/Grand.Business.Common/Services/ExportImport/CountrySchemaProperty.cs@@ -1,19 +1,20 @@-using Grand.Business.Core.Interfaces.ExportImport;+using Grand.Business.Core.Dto;+using Grand.Business.Core.Interfaces.ExportImport;using Grand.Business.Core.Utilities.ExportImport;namespace Grand.Business.Common.Services.ExportImport{- public class CountrySchemaProperty : ISchemaProperty<CountryStates>+ public class CountrySchemaProperty : ISchemaProperty<CountryStatesDto>{- public virtual async Task<PropertyByName<CountryStates>[]> GetProperties()+ public virtual async Task<PropertyByName<CountryStatesDto>[]> GetProperties(){var properties = new[]{- new PropertyByName<CountryStates>("Country", p => p.Country),- new PropertyByName<CountryStates>("StateProvinceName", p => p.StateProvinceName),- new PropertyByName<CountryStates>("Abbreviation", p => p.Abbreviation),- new PropertyByName<CountryStates>("DisplayOrder", p => p.DisplayOrder),- new PropertyByName<CountryStates>("Published", p => p.Published)+ new PropertyByName<CountryStatesDto>("Country", p => p.Country),+ new PropertyByName<CountryStatesDto>("StateProvinceName", p => p.StateProvinceName),+ new PropertyByName<CountryStatesDto>("Abbreviation", p => p.Abbreviation),+ new PropertyByName<CountryStatesDto>("DisplayOrder", p => p.DisplayOrder),+ new PropertyByName<CountryStatesDto>("Published", p => p.Published)};return await Task.FromResult(properties);}diff --git a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs b/src/Business/Grand.Business.Common/Startup/StartupApplication.csindex 0e273aef0..a6976577e 100644--- a/src/Business/Grand.Business.Common/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Common/Startup/StartupApplication.cs@@ -8,6 +8,7 @@ using Grand.Business.Common.Services.Pdf;using Grand.Business.Common.Services.Security;using Grand.Business.Common.Services.Seo;using Grand.Business.Common.Services.Stores;+using Grand.Business.Core.Dto;using Grand.Business.Core.Interfaces.Common.Addresses;using Grand.Business.Core.Interfaces.Common.Configuration;using Grand.Business.Core.Interfaces.Common.Directory;@@ -101,7 +102,7 @@ namespace Grand.Business.Common.Startupprivate void RegisterExportImportService(IServiceCollection serviceCollection){- serviceCollection.AddScoped<ISchemaProperty<CountryStates>, CountrySchemaProperty>();+ serviceCollection.AddScoped<ISchemaProperty<CountryStatesDto>, CountrySchemaProperty>();serviceCollection.AddScoped<IExportProvider, ExcelExportProvider>();serviceCollection.AddScoped(typeof(IExportManager<>), typeof(ExportManager<>));@@ -109,7 +110,7 @@ namespace Grand.Business.Common.StartupserviceCollection.AddScoped<IImportDataProvider, ExcelImportProvider>();serviceCollection.AddScoped(typeof(IImportManager<>), typeof(ImportManager<>));- serviceCollection.AddScoped<IImportDataObject<CountryStates>, CountryImportDataObject>();+ serviceCollection.AddScoped<IImportDataObject<CountryStatesDto>, CountryImportDataObject>();}}}diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/BrandDto.cs b/src/Business/Grand.Business.Core/Dto/BrandDto.cssimilarity index 94%rename from src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/BrandDto.csrename to src/Business/Grand.Business.Core/Dto/BrandDto.csindex 0876116e7..ed19d3c87 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/BrandDto.cs+++ b/src/Business/Grand.Business.Core/Dto/BrandDto.cs@@ -1,4 +1,4 @@-namespace Grand.Business.Catalog.Services.ExportImport.Dto+namespace Grand.Business.Core.Dto{public class BrandDto{diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/CategoryDto.cs b/src/Business/Grand.Business.Core/Dto/CategoryDto.cssimilarity index 95%rename from src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/CategoryDto.csrename to src/Business/Grand.Business.Core/Dto/CategoryDto.csindex 3b804988e..097095da9 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/CategoryDto.cs+++ b/src/Business/Grand.Business.Core/Dto/CategoryDto.cs@@ -1,4 +1,4 @@-namespace Grand.Business.Catalog.Services.ExportImport.Dto+namespace Grand.Business.Core.Dto{public class CategoryDto{diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/CollectionDto.cs b/src/Business/Grand.Business.Core/Dto/CollectionDto.cssimilarity index 94%rename from src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/CollectionDto.csrename to src/Business/Grand.Business.Core/Dto/CollectionDto.csindex 711972ce7..3edb1149e 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/CollectionDto.cs+++ b/src/Business/Grand.Business.Core/Dto/CollectionDto.cs@@ -1,4 +1,4 @@-namespace Grand.Business.Catalog.Services.ExportImport.Dto+namespace Grand.Business.Core.Dto{public class CollectionDto{diff --git a/src/Business/Grand.Business.Common/Services/ExportImport/CountryStates.cs b/src/Business/Grand.Business.Core/Dto/CountryStatesDto.cssimilarity index 74%rename from src/Business/Grand.Business.Common/Services/ExportImport/CountryStates.csrename to src/Business/Grand.Business.Core/Dto/CountryStatesDto.csindex 3bd02864f..420d3dd9a 100644--- a/src/Business/Grand.Business.Common/Services/ExportImport/CountryStates.cs+++ b/src/Business/Grand.Business.Core/Dto/CountryStatesDto.cs@@ -1,6 +1,6 @@-namespace Grand.Business.Common.Services.ExportImport+namespace Grand.Business.Core.Dto{- public class CountryStates+ public class CountryStatesDto{public string Country { get; set; }public string StateProvinceName { get; set; }diff --git a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/ProductDto.cs b/src/Business/Grand.Business.Core/Dto/ProductDto.cssimilarity index 98%rename from src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/ProductDto.csrename to src/Business/Grand.Business.Core/Dto/ProductDto.csindex b5a95e1e3..5cd64f43e 100644--- a/src/Business/Grand.Business.Catalog/Services/ExportImport/Dto/ProductDto.cs+++ b/src/Business/Grand.Business.Core/Dto/ProductDto.cs@@ -1,6 +1,4 @@-using Grand.Domain.Catalog;--namespace Grand.Business.Catalog.Services.ExportImport.Dto+namespace Grand.Business.Core.Dto{public class ProductDto{diff --git a/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs b/src/Business/Grand.Business.Marketing/Startup/StartupApplication.csindex 8a36c6aab..cad2805e3 100644--- a/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs+++ b/src/Business/Grand.Business.Marketing/Startup/StartupApplication.cs@@ -11,7 +11,6 @@ using Grand.Business.Marketing.Services.Courses;using Grand.Business.Marketing.Services.Customers;using Grand.Business.Marketing.Services.Documents;using Grand.Business.Marketing.Services.Newsletters;-using Grand.Business.Marketing.Services.Newsteletters;using Grand.Business.Marketing.Services.PushNotifications;using Grand.Infrastructure;using Microsoft.AspNetCore.Builder;diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.csindex a5867ee45..bd8ce3986 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataMerchandiseReturnActions.cs@@ -1,5 +1,4 @@-using Grand.Business.Core.Interfaces.System.Installation;-using Grand.Domain.Orders;+using Grand.Domain.Orders;namespace Grand.Business.System.Services.Installation{diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.csindex 80a367a8b..105bf325e 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataSettings.cs@@ -1,7 +1,6 @@using Grand.Business.Core.Interfaces.Common.Configuration;using Grand.Business.Core.Interfaces.Storage;-using Grand.Business.Core.Interfaces.System.Installation;-using Grand.Domain.AdminSearch;+using Grand.Domain.Admin;using Grand.Domain.Blogs;using Grand.Domain.Catalog;using Grand.Domain.Cms;diff --git a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.csindex 8b31e1e18..e522f16b8 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/ExportImport/CountryImportDataObjectTests.cs@@ -1,5 +1,6 @@using Grand.Business.Common.Services.Directory;using Grand.Business.Common.Services.ExportImport;+using Grand.Business.Core.Dto;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Data.Tests.MongoDb;using Grand.Domain.Data;@@ -39,9 +40,9 @@ namespace Grand.Business.Common.Tests.Services.ExportImport//Arrangevar country = new Country() { TwoLetterIsoCode = "US", Name = "USA" };await _repository.InsertAsync(country);- var states = new List<CountryStates>() {- new CountryStates() { Country = country.TwoLetterIsoCode, Abbreviation = "AK", StateProvinceName = "Alaska", Published = true },- new CountryStates() { Country = country.TwoLetterIsoCode, Abbreviation = "CA", StateProvinceName = "California", Published = true, DisplayOrder = 1 }+ var states = new List<CountryStatesDto>() {+ new CountryStatesDto() { Country = country.TwoLetterIsoCode, Abbreviation = "AK", StateProvinceName = "Alaska", Published = true },+ new CountryStatesDto() { Country = country.TwoLetterIsoCode, Abbreviation = "CA", StateProvinceName = "California", Published = true, DisplayOrder = 1 }};//Actawait _countryImportDataObject.Execute(states);@@ -59,9 +60,9 @@ namespace Grand.Business.Common.Tests.Services.ExportImportcountry.StateProvinces.Add(new StateProvince() { Abbreviation = "CA" });await _repository.InsertAsync(country);- var states = new List<CountryStates>() {- new CountryStates() { Country = country.TwoLetterIsoCode, Abbreviation = "AK", StateProvinceName = "Alaska", Published = true },- new CountryStates() { Country = country.TwoLetterIsoCode, Abbreviation = "CA", StateProvinceName = "California", Published = true, DisplayOrder = 1 }+ var states = new List<CountryStatesDto>() {+ new CountryStatesDto() { Country = country.TwoLetterIsoCode, Abbreviation = "AK", StateProvinceName = "Alaska", Published = true },+ new CountryStatesDto() { Country = country.TwoLetterIsoCode, Abbreviation = "CA", StateProvinceName = "California", Published = true, DisplayOrder = 1 }};//Actawait _countryImportDataObject.Execute(states);@@ -80,10 +81,10 @@ namespace Grand.Business.Common.Tests.Services.ExportImportcountry.StateProvinces.Add(new StateProvince() { Abbreviation = "CA" });await _repository.InsertAsync(country);- var states = new List<CountryStates>() {- new CountryStates() { Country = country.TwoLetterIsoCode, Abbreviation = "AK", StateProvinceName = "Alaska", Published = true },- new CountryStates() { Country = country.TwoLetterIsoCode, Abbreviation = "CA", StateProvinceName = "California", Published = true, DisplayOrder = 1 },- new CountryStates() { Country = country.TwoLetterIsoCode, Abbreviation = "HI", StateProvinceName = "Hawaii", Published = true, DisplayOrder = 1 }+ var states = new List<CountryStatesDto>() {+ new CountryStatesDto() { Country = country.TwoLetterIsoCode, Abbreviation = "AK", StateProvinceName = "Alaska", Published = true },+ new CountryStatesDto() { Country = country.TwoLetterIsoCode, Abbreviation = "CA", StateProvinceName = "California", Published = true, DisplayOrder = 1 },+ new CountryStatesDto() { Country = country.TwoLetterIsoCode, Abbreviation = "HI", StateProvinceName = "Hawaii", Published = true, DisplayOrder = 1 }};//Actawait _countryImportDataObject.Execute(states);diff --git a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs b/src/Web/Grand.Web.Admin/Controllers/BrandController.csindex 8e4cda031..f0ef3c027 100644--- a/src/Web/Grand.Web.Admin/Controllers/BrandController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/BrandController.cs@@ -1,4 +1,4 @@-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Brands;using Grand.Business.Core.Interfaces.Common.Directory;diff --git a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs b/src/Web/Grand.Web.Admin/Controllers/CategoryController.csindex c161f2604..f08798316 100644--- a/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CategoryController.cs@@ -1,4 +1,4 @@-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Categories;using Grand.Business.Core.Interfaces.Common.Directory;diff --git a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs b/src/Web/Grand.Web.Admin/Controllers/CollectionController.csindex 6b7e99f4a..c4c4427d3 100644--- a/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CollectionController.cs@@ -1,4 +1,4 @@-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Collections;using Grand.Business.Core.Interfaces.Common.Directory;diff --git a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs b/src/Web/Grand.Web.Admin/Controllers/CountryController.csindex be403a9e8..663807b22 100644--- a/src/Web/Grand.Web.Admin/Controllers/CountryController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CountryController.cs@@ -1,4 +1,4 @@-using Grand.Business.Common.Services.ExportImport;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Common.Directory;using Grand.Business.Core.Interfaces.Common.Localization;@@ -25,8 +25,8 @@ namespace Grand.Web.Admin.Controllersprivate readonly ICountryViewModelService _countryViewModelService;private readonly ITranslationService _translationService;private readonly ILanguageService _languageService;- private readonly IExportManager<CountryStates> _exportManager;- private readonly IImportManager<CountryStates> _importManager;+ private readonly IExportManager<CountryStatesDto> _exportManager;+ private readonly IImportManager<CountryStatesDto> _importManager;#endregion@@ -36,8 +36,8 @@ namespace Grand.Web.Admin.ControllersICountryViewModelService countryViewModelService,ITranslationService translationService,ILanguageService languageService,- IExportManager<CountryStates> exportManager,- IImportManager<CountryStates> importManager)+ IExportManager<CountryStatesDto> exportManager,+ IImportManager<CountryStatesDto> importManager){_countryService = countryService;_countryViewModelService = countryViewModelService;@@ -347,7 +347,7 @@ namespace Grand.Web.Admin.Controllersvar countries = await _countryService.GetAllCountries();var query = from p in countriesfrom s in p.StateProvinces- select new CountryStates {+ select new CountryStatesDto {Country = p.TwoLetterIsoCode,StateProvinceName = s.Name,Abbreviation = s.Abbreviation,diff --git a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs b/src/Web/Grand.Web.Admin/Controllers/ProductController.csindex 16b9431ab..8ff6e029b 100644--- a/src/Web/Grand.Web.Admin/Controllers/ProductController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/ProductController.cs@@ -1,4 +1,4 @@-using Grand.Business.Catalog.Services.ExportImport.Dto;+using Grand.Business.Core.Dto;using Grand.Business.Core.Extensions;using Grand.Business.Core.Interfaces.Catalog.Products;using Grand.Business.Core.Interfaces.Common.Directory;diff --git a/src/Web/Grand.Web.Admin/Controllers/SearchController.cs b/src/Web/Grand.Web.Admin/Controllers/SearchController.csindex 9bee9b197..021b133d4 100644--- a/src/Web/Grand.Web.Admin/Controllers/SearchController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SearchController.cs@@ -7,7 +7,6 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Customers;using Grand.Infrastructure;using Grand.Domain;-using Grand.Domain.AdminSearch;using Grand.Domain.Customers;using Grand.Web.Admin.Extensions;using Grand.Web.Admin.Models.Settings;@@ -20,6 +19,7 @@ using Grand.Business.Core.Interfaces.Common.Stores;using Grand.Domain.Stores;using Grand.Domain.Vendors;using Grand.Business.Core.Interfaces.Catalog.Brands;+using Grand.Domain.Admin;namespace Grand.Web.Admin.Controllers{diff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.csindex fb6dea8b6..b3b1b68bf 100644--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs@@ -7,7 +7,7 @@ using Grand.Business.Core.Interfaces.Common.Localization;using Grand.Business.Core.Interfaces.Common.Logging;using Grand.Business.Core.Utilities.Common.Security;using Grand.Business.Core.Interfaces.Storage;-using Grand.Domain.AdminSearch;+using Grand.Domain.Admin;using Grand.Domain.Blogs;using Grand.Domain.Catalog;using Grand.Domain.Common;diff --git a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csprojindex 7ffb6c0b0..d925fc640 100644--- a/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj+++ b/src/Web/Grand.Web.Admin/Grand.Web.Admin.csproj@@ -22,16 +22,6 @@<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="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" /><ProjectReference Include="..\Grand.Web.Common\Grand.Web.Common.csproj" /></ItemGroup></Project>diff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csprojindex 221f8ba49..f92c21c40 100644--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj@@ -1,24 +1,39 @@<Project Sdk="Microsoft.NET.Sdk">- <Import Project="..\..\Build\Grand.Common.props" />- <ItemGroup>- <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.2" />- <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.2" />- <PackageReference Include="Azure.Identity" Version="1.9.0" />- <PackageReference Include="Flurl.Http" Version="3.2.4" />- <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.20" />- <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />- <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />- <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.20.0" />- <PackageReference Include="Wangkanai.Detection" Version="7.1.0" />- <PackageReference Include="WebMarkupMin.AspNetCore6" Version="2.14.1" />- <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />- <PackageReference Include="WebMarkupMin.NUglify" Version="2.14.0" />- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.20" />- </ItemGroup>+ <Import Project="..\..\Build\Grand.Common.props" />+ <ItemGroup>+ <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.2" />+ <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.2" />+ <PackageReference Include="Azure.Identity" Version="1.9.0" />+ <PackageReference Include="Flurl.Http" Version="3.2.4" />+ <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.20" />+ <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />+ <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />+ <PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.20.0" />+ <PackageReference Include="Wangkanai.Detection" Version="7.1.0" />+ <PackageReference Include="WebMarkupMin.AspNetCore6" Version="2.14.1" />+ <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />+ <PackageReference Include="WebMarkupMin.NUglify" Version="2.14.0" />+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.20" />+ </ItemGroup>++ <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>++ <ItemGroup>+ <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" />+ </ItemGroup>+- <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>\ No newline at end of filediff --git a/src/Web/Grand.Web/Grand.Web.csproj b/src/Web/Grand.Web/Grand.Web.csprojindex 43573b0db..0a3878eea 100644--- a/src/Web/Grand.Web/Grand.Web.csproj+++ b/src/Web/Grand.Web/Grand.Web.csproj@@ -32,23 +32,9 @@<ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" /><ProjectReference Include="..\Grand.Web.Common\Grand.Web.Common.csproj" /><ProjectReference Include="..\Grand.Web.Admin\Grand.Web.Admin.csproj" />-<ProjectReference Include="..\..\API\Grand.Api\Grand.Api.csproj" /></ItemGroup>- <ItemGroup>- <ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Checkout\Grand.Business.Checkout.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Cms\Grand.Business.Cms.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Common\Grand.Business.Common.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Customers\Grand.Business.Customers.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj" />- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" />- </ItemGroup>-<ItemGroup><Content Include="App_Data\**" CopyToPublishDirectory="PreserveNewest" Exclude="App_Data\appsettings.json;App_Data\DataProtectionKeys\*.xml;" /><Content Include="Themes\**" CopyToPublishDirectory="PreserveNewest" Exclude="Themes\**\*.cfg;Themes\**\*.cshtml" />